Merge branch 'master' of https://github.com/skuzzis/swiftly

Author: skuzzis

docgen/data/data.json

@@ -2791,6 +2791,19 @@
 				},
 				"additional": {}
 			},
+			"ispistolround": {
+				"title": "IsPistolRound",
+				"template": "function-syntax",
+				"language": "both",
+				"description": "Checks if the round is a PistolRound.",
+				"variable": {
+					"cpp": "server->IsPistolRound",
+					"lua": "server:IsPistolRound"
+				},
+				"return": "bool",
+				"params": {},
+				"additional": {}
+			},
 			"executecommand": {
 				"title": "ExecuteCommand",
 				"template": "function-syntax",

plugin_files/scripting/includes/swiftly/server.h

@@ -50,6 +50,18 @@ class Server
         this->ExecuteCommand("changelevel %s", map);
     }
 
+    bool IsPistolRound()
+    {
+        void *IsPistolRoundFunc = FetchFunctionPtr(nullptr, "scripting_Server_IsPistolRound");
+        if (IsPistolRoundFunc)
+            return reinterpret_cast<Server_IsPistolRound>(IsPistolRoundFunc)();
+        else
+        {
+            NOT_SUPPORTED("scripting_Server_IsPistolRound");
+            return false;
+        }
+    }
+
     bool IsMapValid(const char *map)
     {
         void *IsMapValidFunc = FetchFunctionPtr(nullptr, "scripting_Server_IsMapValid");
@@ -89,4 +101,4 @@ class Server
 
 extern Server *server;
 
-#endif
+#endif

plugin_files/scripting/includes/swiftly/swiftly_memory.h

@@ -75,6 +75,7 @@ typedef const char *(*Server_GetMap)();
 typedef uint16_t (*Server_GetMaxPlayers)();
 typedef bool (*Server_IsMapValid)(const char *);
 typedef void (*Server_AddPrecacheModel)(const char *);
+typedef bool (*Server_IsPistolRound)();
 
 typedef uint64_t (*HTTP_CreateRequest)(const char *);
 typedef void (*HTTP_SetBody)(uint64_t, const char *);

src/components/Plugins/inc/Scripting.h

@@ -214,6 +214,7 @@ SMM_API void scripting_Server_ExecuteCommand(const char *str);
 SMM_API uint16 scripting_Server_GetMaxPlayers();
 SMM_API const char *scripting_Server_GetMapName();
 SMM_API bool scripting_Server_IsMapValid(const char *map);
+SMM_API bool scripting_Server_IsPistolRound();
 
 SMM_API const char *scripting_Translations_Fetch(const char *key);
 

src/components/Plugins/src/language/lua/server.cpp

@@ -28,7 +28,10 @@ void SetupLuaServer(luacpp::LuaState *state, Plugin *plugin)
         .DefMember("ChangeLevel", [](LuaServerClass *base, const char *map) -> void
                    {
             if(!scripting_Server_IsMapValid(map)) return;
-            scripting_Server_ExecuteCommand(string_format("map %s", map).c_str()); });
+            scripting_Server_ExecuteCommand(string_format("map %s", map).c_str()); })
+
+    .DefMember("IsPistolRound", [](LuaServerClass *base) -> bool
+            { return scripting_Server_IsPistolRound(); });
 
     state->DoString("server = Server()");
 }

src/components/Plugins/src/scripting/Server.cpp

@@ -1,4 +1,5 @@
 #include "../../../../common.h"
+#include "sdk/entity/CGameRules.h"
 
 SMM_API void scripting_Server_ExecuteCommand(const char *str)
 {
@@ -25,6 +26,17 @@ SMM_API const char *scripting_Server_GetMapName()
     return res;
 }
 
+
+SMM_API bool scripting_Server_IsPistolRound()
+{
+    if (g_pGameRules == nullptr)
+        return false;
+
+    return (g_pGameRules->m_totalRoundsPlayed() == 0 || (g_pGameRules->m_bSwitchingTeamsAtRoundReset() && g_pGameRules->m_nOvertimePlaying() == 0) || g_pGameRules->m_bGameRestart());
+}
+
+
+
 SMM_API bool scripting_Server_IsMapValid(const char *map)
 {
     if (map == nullptr)

src/sdk/entity/CGameRules.h

@@ -19,6 +19,10 @@ class CCSGameRules : public CGameRules
     SCHEMA_FIELD_OFFSET(int, m_totalRoundsPlayed, 0)
     SCHEMA_FIELD_OFFSET(GameTime_t, m_fRoundStartTime, 0)
     SCHEMA_FIELD_OFFSET(GameTime_t, m_flRestartRoundTime, 0)
+    SCHEMA_FIELD_OFFSET(int32_t, m_nOvertimePlaying, 0)
+    SCHEMA_FIELD_OFFSET(bool, m_bSwitchingTeamsAtRoundReset, 0)
+    SCHEMA_FIELD_OFFSET(bool, m_bGameRestart, 0)
+    SCHEMA_FIELD_OFFSET(int, m_iRoundTime, 0)
 };
 
 class CCSGameRulesProxy : public Z_CBaseEntity