From 2ea750fa80760cc1633bad54de13c83d1b69d738 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 26 Feb 2022 22:30:53 -0600
Subject: [PATCH] Use server settings bit flags

---
 scripts/server/bitflag.js |  2 +-
 scripts/server/config.js  | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/scripts/server/bitflag.js b/scripts/server/bitflag.js
index 883f0aa7..b095c2e8 100644
--- a/scripts/server/bitflag.js
+++ b/scripts/server/bitflag.js
@@ -410,7 +410,7 @@ function getModerationFlagValue(flagName) {
 
 // ===========================================================================
 
-function getServerSettingFlagValue(flagName) {
+function getServerSettingsFlagValue(flagName) {
     if(flagName == "All") {
         return -1;
 	}
diff --git a/scripts/server/config.js b/scripts/server/config.js
index fb1bdf89..d736d036 100644
--- a/scripts/server/config.js
+++ b/scripts/server/config.js
@@ -162,13 +162,11 @@ function saveServerConfigToDatabase() {
 		let dbConnection = connectToDatabase();
 		if(dbConnection) {
 			let data = [
-				["svr_logo", boolToInt(hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("ServerLogo")))],
+				["svr_settings", toInteger(getServerConfig().settings)],
 				["svr_gui", boolToInt(hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("GUI")))],
 				["svr_start_time_hour", getServerConfig().hour],
 				["svr_start_time_min", getServerConfig().minute],
 				["svr_start_weather", getServerConfig().weather],
-				["svr_start_snow_falling", boolToInt(hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("FallingSnow")))],
-				["svr_start_snow_ground", boolToInt(hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("GroundSnow")))],
 				["svr_newchar_pos_x", getServerConfig().newCharacter.spawnPosition.x],
 				["svr_newchar_pos_y", getServerConfig().newCharacter.spawnPosition.y],
 				["svr_newchar_pos_z", getServerConfig().newCharacter.spawnPosition.z],
@@ -200,16 +198,6 @@ function saveServerConfigToDatabase() {
 				["svr_charselect_int", getServerConfig().characterSelectInterior],
 				["svr_charselect_vw", getServerConfig().characterSelectDimension],
 				["svr_inflation_multiplier", getServerConfig().inflationMultiplier],
-				["svr_ac_enabled", boolToInt(hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("Anticheat")))],
-				["svr_ac_check_scripts", boolToInt(hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("CheckGameScripts")))],
-				["svr_ac_script_wl", boolToInt(hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("GameScriptWhiteList")))],
-				["svr_ac_script_bl", boolToInt(hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("GameScriptBlackList")))],
-				["svr_job_pickups", boolToInt(hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("JobPickups")))],
-				["svr_job_blips", boolToInt(hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("JobBlips")))],
-				["svr_biz_pickups", boolToInt(hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("BusinessPickups")))],
-				["svr_biz_blips", boolToInt(hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("BusinessBlips")))],
-				["svr_house_pickups", boolToInt(hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("HousePickups")))],
-				["svr_house_blips", boolToInt(hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("HouseBlips")))],
 				["svr_intro_music", getServerConfig().introMusicURL],
 			];