support for tf2c/of

.github/workflows/blank.yml

@@ -28,7 +28,9 @@ jobs:
       run: |
         cd ./scripting
         pwd
-        spcomp -i"./include/" stac.sp -o ../plugins/stac.smx
+        spcomp          -i"./include/" stac.sp -o ../plugins/stac.smx
+        spcomp TF2C=yep -i"./include/" stac.sp -o ../plugins/disabled/stac_tf2c.smx
+        spcomp OF=yep   -i"./include/" stac.sp -o ../plugins/disabled/stac_of.smx
         ls -la
 
     - name: Zip packages

scripting/stac.sp

@@ -5,11 +5,21 @@
 #pragma semicolon 1
 #pragma newdecls required
 
+// #define TF2C
+// #define OF
+
 #include <sourcemod>
 #include <regex>
 #include <sdktools>
 #include <sdkhooks>
-#include <tf2_stocks>
+#if defined TF2C
+    #include <tf2c>
+#elseif defined OF
+    #include <openfortress>
+#else
+    #include <tf2_stocks>
+#endif
+
 // external incs
 #include <achievements>
 #include <morecolors>
@@ -27,9 +37,15 @@
 #pragma semicolon 1
 #pragma newdecls required
 
-#define PLUGIN_VERSION  "5.4.1"
+#define PLUGIN_VERSION  "5.5.0"
 
-#define UPDATE_URL      "https://raw.githubusercontent.com/sapphonie/StAC-tf2/master/updatefile.txt"
+#if defined TF2C
+    #define UPDATE_URL      "https://raw.githubusercontent.com/sapphonie/StAC-tf2/master/updatefile_tf2c.txt"
+#elseif defined OF
+    #define UPDATE_URL      "https://raw.githubusercontent.com/sapphonie/StAC-tf2/master/updatefile_of.txt"
+#else
+    #define UPDATE_URL      "https://raw.githubusercontent.com/sapphonie/StAC-tf2/master/updatefile.txt"
+#endif
 
 public Plugin myinfo =
 {
@@ -78,7 +94,7 @@ public void OnPluginStart()
 
     if (MaxClients > TFMAXPLAYERS)
     {
-        SetFailState("[StAC] This plugin (and TF2 in general) does not support more than 33 players (32 + 1 for STV). Aborting!");
+        SetFailState("[StAC] This plugin (and TF2 in general) does not support more than %i players. Aborting!", TFMAXPLAYERS);
     }
 
     LoadTranslations("common.phrases");

scripting/stac/stac_cvar_checks.sp

@@ -24,8 +24,10 @@ char miscVars[][] =
     "snd_visualize",
     // must be == 1
     "fog_enable",
+#if !defined OF
     // must be == 0
     "cl_thirdperson",
+#endif
     // must be == 0
     "r_portalsopenall",
     // must be == 1.0
@@ -143,7 +145,14 @@ public void ConVarCheck(QueryCookie cookie, int Cl, ConVarQueryResult result, co
     {
         int fovDesired = StringToInt(cvarValue);
         // check just in case
+
+        // of max fov is 160
+        #if defined OF
+        if (fovDesired < 20 || fovDesired > 160)
+        // tf2 max fov is 90
+        #else
         if (fovDesired < 20 || fovDesired > 90)
+        #endif
         {
             oobVarsNotify(userid, cvarName, cvarValue);
             if (banForMiscCheats)
@@ -224,6 +233,7 @@ public void ConVarCheck(QueryCookie cookie, int Cl, ConVarQueryResult result, co
         }
     }
 
+    #if !defined OF
     // cl_thirdperson (hidden cvar! should NEVER not be 0)
     // used for enabling thirdperson
     else if (StrEqual(cvarName, "cl_thirdperson"))
@@ -237,6 +247,7 @@ public void ConVarCheck(QueryCookie cookie, int Cl, ConVarQueryResult result, co
             }
         }
     }
+    #endif
 
     // r_portalsopenall (cheat cvar! should NEVER not be 0)
     // used for disabling areaportal checks, so you can see the entire world at once. essentially "far esp"

scripting/stac/stac_cvars.sp

@@ -656,6 +656,8 @@ void RunOptimizeCvars()
     // limit fakelag abuse / backtracking (CS:GO default value!)
     SetConVarFloat(FindConVar("sv_maxunlag"), 0.2);
 
+// these cvars don't exist outside of tf2 (atm)
+#if !defined OF && !defined TF2C
     // print dc reasons to clients
     SetConVarBool(FindConVar("net_disconnect_reason"), true);
 
@@ -666,6 +668,7 @@ void RunOptimizeCvars()
     {
         SetConVarInt(net_chan_limit_msec, 75);
     }
+#endif
 
     // fix backtracking
     ConVar jay_backtrack_enable     = FindConVar("jay_backtrack_enable");

scripting/stac/stac_globals.sp

@@ -1,7 +1,11 @@
 #pragma semicolon 1
 
-// we don't need 64 maxplayers because this is only for tf2. saves some memory.
-#define TFMAXPLAYERS 33
+#if defined TF2C
+    #define TFMAXPLAYERS 65
+#else
+    #define TFMAXPLAYERS 33
+#endif
+
 
 /********** GLOBAL VARS **********/
 

scripting/stac/stac_mapchange.sp

@@ -57,6 +57,10 @@ Action checkNativesEtc(Handle timer)
     {
         waitStatus = true;
     }
+
+    #if defined OF
+    MVM = false;
+    #else
     // are we in mann vs machine?
     if (GameRules_GetProp("m_bPlayingMannVsMachine") == 1)
     {
@@ -66,7 +70,7 @@ Action checkNativesEtc(Handle timer)
     {
         MVM = false;
     }
-
+    #endif
     // check natives!
 
     // sourcebans

scripting/stac/stac_onplayerruncmd.sp

@@ -484,7 +484,14 @@ void cmdnumspikeCheck(int userid)
     {
         int spikeamt = clcmdnum[Cl][0] - clcmdnum[Cl][1];
         // https://github.com/sapphonie/StAC-tf2/issues/74
+
+        // clients in OF can trigger this by lagging, hackers tend to hit ~1000
+        // -rowedahelicon
+        #if defined OF
+        if (spikeamt >= 999 || spikeamt < 0)
+        #else
         if (spikeamt >= 32 || spikeamt < 0)
+        #endif
         {
             char heldWeapon[256];
             GetClientWeapon(Cl, heldWeapon, sizeof(heldWeapon));