Merge pull request #14 from punteroo/development

Fixed ConVar Declaration for Cookies
punteroo · Nov 3, 2021 · 52f51a2 · 52f51a2
2 parents e46c3f5 + 0fc3692
commit 52f51a2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git a/plugins/tf2item_cosmetics.smx b/plugins/tf2item_cosmetics.smx
diff --git a/plugins/tf2item_weapons.smx b/plugins/tf2item_weapons.smx
diff --git a/scripting/tf2item_cosmetics.sp b/scripting/tf2item_cosmetics.sp
@@ -3,7 +3,7 @@
 #pragma semicolon 1
 #pragma newdecls required
 
-#define PLUGIN_VERSION "3.1.0"
+#define PLUGIN_VERSION "3.1.1"
 
 public Plugin myinfo = 
 {
@@ -85,20 +85,19 @@ public void OnPluginStart()
 	unusualNames = new ArrayList(64);
 	unusualIds   = new ArrayList();
 
+	// Run forward to execute ConVar declarations
+	OnConfigsExecuted();
+
 	// Handle late loading
 	if (bLateLoad) {
-		OnConfigsExecuted();
-
-		// Register Preference Saving Cookie
-		pPreferences = CV_UseCookies.BoolValue ? RegClientCookie("tf2item_cosmetics_prefs", "Cosmetic override preferences set for this user.", CookieAccess_Private) : INVALID_HANDLE;
-
 		for (int i = 1; i < MaxClients; i++) {
 			if (IsClientInGame(i) && !IsClientSourceTV(i) && !IsFakeClient(i))
 				OnClientPostAdminCheck(i);
 		}
-	} else
-		// Register Preference Saving Cookie
-		pPreferences = CV_UseCookies.BoolValue ? RegClientCookie("tf2item_cosmetics_prefs", "Cosmetic override preferences set for this user.", CookieAccess_Private) : INVALID_HANDLE;
+	}
+
+	// Register Preference Saving Cookie
+	pPreferences = CV_UseCookies.BoolValue ? RegClientCookie("tf2item_cosmetics_prefs", "Cosmetic override preferences set for this user.", CookieAccess_Private) : INVALID_HANDLE;
 }
 
 // Hook spawns if the ConVar is on

diff --git a/scripting/tf2item_weapons.sp b/scripting/tf2item_weapons.sp
@@ -3,7 +3,7 @@
 #pragma semicolon 1
 #pragma newdecls required
 
-#define PLUGIN_VERSION "3.1.0"
+#define PLUGIN_VERSION "3.1.1"
 
 public Plugin myinfo = 
 {
@@ -42,7 +42,7 @@ int clipOff;
 int ammoOff;
 
 // Global Late Loading Value
-bool bLateLoad;
+bool bLateLoad = false;
 
 /////////////////////
 /////////////////////
@@ -87,20 +87,19 @@ public void OnPluginStart() {
 	HookEvent("player_spawn", OnPlayerSpawn);
 	HookEvent("post_inventory_application", OnPlayerSpawn);
 
+	// Run forward to execute ConVar declarations
+	OnConfigsExecuted();
+
 	// Late loading reset
 	if (bLateLoad) {
-		OnConfigsExecuted();
-
-		// Register Preference Saving Cookie
-		pPreferences = CV_UseCookies.BoolValue ? RegClientCookie("tf2item_weapons_prefs", "Weapon override preferences set for this user.", CookieAccess_Private) : INVALID_HANDLE;
-
 		for (int i = 1; i < MaxClients; i++) {
 			if (IsClientInGame(i) && !IsClientSourceTV(i) && !IsFakeClient(i))
 				OnClientPostAdminCheck(i);
 		}
-	} else
-		// Register Preference Saving Cookie
-		pPreferences = CV_UseCookies.BoolValue ? RegClientCookie("tf2item_weapons_prefs", "Weapon override preferences set for this user.", CookieAccess_Private) : INVALID_HANDLE;
+	}
+
+	// Register Preference Saving Cookie
+	pPreferences = CV_UseCookies.BoolValue ? RegClientCookie("tf2item_weapons_prefs", "Weapon override preferences set for this user.", CookieAccess_Private) : INVALID_HANDLE;
 }
 
 /* public Action CMD_Test(int client, int args) {

diff --git a/scripting/tf2items/tf2item_base.inc b/scripting/tf2items/tf2item_base.inc
@@ -13,6 +13,11 @@
 /*
  * Change-Log
  *
+ * 3.1.1 - 03/11/21
+ * General
+ *  - Fixed #13
+ *    - Overlooked ConVar declaration mistake in logic.
+ *
  * 3.1.0 - 02/11/21
  * General
  *  - Implemented search functionality for Unusual effects and War Paints.