Merge pull request #13 from diamante0018/main

Clean up gsc functions with additional checks

src/component/command.cpp

@@ -49,6 +49,7 @@ namespace command
 			if (i > index) result.append(" ");
 			result.append(this->get(i));
 		}
+
 		return result;
 	}
 
@@ -96,7 +97,6 @@ namespace command
 	public:
 		void post_unpack() override
 		{
-
 		}
 	};
 }

src/component/gsc.cpp

@@ -380,6 +380,20 @@ namespace gsc
 				return {};
 			});
 
+			function::add("dropallbots", [](const function_args& args) -> scripting::script_value
+			{
+				for (auto i = 0; i < *game::svs_clientCount; i++)
+				{
+					if (game::svs_clients[i].header.state != game::CS_FREE
+						&& game::svs_clients[i].header.netchan.remoteAddress.type == game::NA_BOT)
+					{
+						game::SV_GameDropClient(i, "GAME_GET_TO_COVER");
+					}
+				}
+
+				return {};
+			});
+
 			method::add("tell", [](const game::scr_entref_t ent, const function_args& args) -> scripting::script_value
 			{
 				if (ent.classnum != 0)
@@ -388,8 +402,13 @@ namespace gsc
 				}
 
 				const auto client = ent.entnum;
-				const auto message = args[0].as<std::string>();
 
+				if (game::g_entities[client].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
+				const auto message = args[0].as<std::string>();
 				game::SV_GameSendServerCommand(client, 0, utils::string::va("%c \"%s\"", 84, message.data()));
 
 				return {};
@@ -402,20 +421,39 @@ namespace gsc
 					throw std::runtime_error("Invalid entity");
 				}
 
-				const auto num = ent.entnum;
+				const auto client = ent.entnum;
+
+				if (game::g_entities[client].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
 				const auto toggle = args[0].as<int>();
+				auto flags = game::g_entities[client].client->ps.perks[0];
 
-				auto g_client = game::g_entities[num].client;
-				auto playerState = &g_client->ps;
-				auto flags = playerState->perks[0];
-
-				playerState->perks[0] = toggle
-					? flags | 0x4000u
-					: flags & ~0x4000u;
+				game::g_entities[client].client->ps.perks[0] = toggle
+					? flags | 0x4000u : flags & ~0x4000u;
 
 				return {};
 			});
 
+			method::add("isbot", [](const game::scr_entref_t ent, const function_args& args) -> scripting::script_value
+			{
+				if (ent.classnum != 0)
+				{
+					throw std::runtime_error("Invalid entity");
+				}
+
+				const auto client = ent.entnum;
+
+				if (game::g_entities[client].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
+				return game::svs_clients[client].bIsTestClient;
+			});
+
 			utils::hook::jump(0x56C8EB, call_builtin_stub);
 			utils::hook::jump(0x56CBDC, call_builtin_method_stub);
 		}

src/component/notifies.cpp

@@ -14,7 +14,13 @@ namespace notifies
 
 		void client_command_stub(int clientNum)
 		{
-			char cmd[1024] = { 0 };
+			char cmd[1024] = {0};
+			const auto* entity = &game::g_entities[clientNum];
+
+			if (entity->client == nullptr)
+			{
+				return; // Client is not fully in game yet
+			}
 
 			game::SV_Cmd_ArgvBuffer(0, cmd, 1024);
 
@@ -29,7 +35,7 @@ namespace notifies
 					const auto entity_id = game::Scr_GetEntityId(clientNum, 0);
 					const auto result = callback(entity_id, {message, cmd == "say_team"s});
 
-					if (result.is<int>())
+					if (result.is<int>() && !hidden)
 					{
 						hidden = result.as<int>() == 0;
 					}

src/component/scripting.cpp

@@ -85,7 +85,6 @@ namespace scripting
 				callback();
 			}
 
-			shutdown_callbacks = {};
 			g_shutdown_game_hook.invoke<void>(free_scripts);
 		}
 

src/component/userinfo.cpp

@@ -13,12 +13,17 @@ namespace userinfo
 	{
 		utils::hook::detour sv_getuserinfo_hook;
 
-		userinfo_map userinfo_to_map(const std::string& userinfo)
+		userinfo_map userinfo_to_map(std::string userinfo)
 		{
-			userinfo_map map;
-			const auto args = utils::string::split(userinfo, '\\');
+			userinfo_map map{};
 
-			for (auto i = 1; i < args.size() - 1; i += 2)
+			if (userinfo[0] == '\\')
+			{
+				userinfo = userinfo.substr(1);
+			}
+
+			const auto args = utils::string::split(userinfo, '\\');
+			for (size_t i = 0; !args.empty() && i < (args.size() - 1); i += 2)
 			{
 				map[args[i]] = args[i + 1];
 			}
@@ -28,7 +33,7 @@ namespace userinfo
 
 		std::string map_to_userinfo(const userinfo_map& map)
 		{
-			std::string buffer;
+			std::string buffer{};
 
 			for (const auto& value : map)
 			{
@@ -43,9 +48,8 @@ namespace userinfo
 
 		void sv_getuserinfo_stub(int index, char* buffer, int bufferSize)
 		{
-			char _buffer[1024];
-			sv_getuserinfo_hook.invoke<void>(index, _buffer, 1024);
-			auto map = userinfo_to_map(_buffer);
+			sv_getuserinfo_hook.invoke<void>(index, buffer, bufferSize);
+			auto map = userinfo_to_map(buffer);
 
 			if (userinfo_overrides.find(index) == userinfo_overrides.end())
 			{
@@ -88,13 +92,18 @@ namespace userinfo
 
 			gsc::method::add("setname", [](const game::scr_entref_t ent, const gsc::function_args& args) -> scripting::script_value
 			{
-				const auto name = args[0].as<std::string>();
-
-				if (ent.classnum != 0 || ent.entnum > 17)
+				if (ent.classnum != 0)
 				{
 					throw std::runtime_error("Invalid entity");
 				}
 
+				if (game::g_entities[ent.entnum].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
+				const auto name = args[0].as<std::string>();
+
 				userinfo_overrides[ent.entnum]["name"] = name;
 				game::ClientUserinfoChanged(ent.entnum);
 
@@ -103,11 +112,16 @@ namespace userinfo
 
 			gsc::method::add("resetname", [](const game::scr_entref_t ent, const gsc::function_args& args) -> scripting::script_value
 			{
-				if (ent.classnum != 0 || ent.entnum > 17)
+				if (ent.classnum != 0)
 				{
 					throw std::runtime_error("Invalid entity");
 				}
 
+				if (game::g_entities[ent.entnum].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
 				userinfo_overrides[ent.entnum].erase("name");
 				game::ClientUserinfoChanged(ent.entnum);
 
@@ -116,13 +130,18 @@ namespace userinfo
 
 			gsc::method::add("setclantag", [](const game::scr_entref_t ent, const gsc::function_args& args) -> scripting::script_value
 			{
-				const auto name = args[0].as<std::string>();
-
-				if (ent.classnum != 0 || ent.entnum > 17)
+				if (ent.classnum != 0)
 				{
 					throw std::runtime_error("Invalid entity");
 				}
 
+				if (game::g_entities[ent.entnum].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
+				const auto name = args[0].as<std::string>();
+
 				userinfo_overrides[ent.entnum]["clantag"] = name;
 				userinfo_overrides[ent.entnum]["ec_TagText"] = name;
 				userinfo_overrides[ent.entnum]["ec_usingTag"] = "1";
@@ -133,11 +152,16 @@ namespace userinfo
 
 			gsc::method::add("resetclantag", [](const game::scr_entref_t ent, const gsc::function_args& args) -> scripting::script_value
 			{
-				if (ent.classnum != 0 || ent.entnum > 17)
+				if (ent.classnum != 0)
 				{
 					throw std::runtime_error("Invalid entity");
 				}
 
+				if (game::g_entities[ent.entnum].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
 				userinfo_overrides[ent.entnum].erase("clantag");
 				userinfo_overrides[ent.entnum].erase("ec_TagText");
 				userinfo_overrides[ent.entnum].erase("ec_usingTag");
@@ -148,11 +172,16 @@ namespace userinfo
 
 			gsc::method::add("removeclantag", [](const game::scr_entref_t ent, const gsc::function_args& args) -> scripting::script_value
 			{
-				if (ent.classnum != 0 || ent.entnum > 17)
+				if (ent.classnum != 0)
 				{
 					throw std::runtime_error("Invalid entity");
 				}
 
+				if (game::g_entities[ent.entnum].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
 				userinfo_overrides[ent.entnum]["clantag"] = "";
 				userinfo_overrides[ent.entnum]["ec_TagText"] = "";
 				userinfo_overrides[ent.entnum]["ec_usingTag"] = "0";

src/dllmain.cpp

@@ -5,13 +5,13 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv
 {
     if (ul_reason_for_call == DLL_PROCESS_ATTACH)
     {
-        const auto value = *reinterpret_cast<DWORD*>(0x20900000);
-        if (value != 0xF0681B6A)
+        const auto value = *reinterpret_cast<DWORD*>(0x21600000);
+        if (value != 0x8A94852)
         {
             MessageBoxA(NULL,
                 "This version of iw5-gsc-utils is outdated.\n" \
-                "Download the latest dll from here: https://github.com/fedddddd/iw5-gsc-utils/releases" \
-            , "ERROR", MB_ICONERROR);
+                "Download the latest dll from here: https://github.com/fedddddd/iw5-gsc-utils/releases", 
+                "ERROR", MB_ICONERROR);
 
             return FALSE;
         }

src/game/game.cpp

@@ -2,5 +2,11 @@
 
 namespace game
 {
-
+	void SV_GameDropClient(int clientNum, const char* reason)
+	{
+		if (clientNum >= 0 && clientNum < sv_maxclients->current.integer)
+		{
+			SV_DropClient(&svs_clients[clientNum], reason, true);
+		}
+	}
 }

src/game/game.hpp

@@ -29,6 +29,8 @@ namespace game
 	private:
 		T* dedi_;
 	};
+
+	void SV_GameDropClient(int clientNum, const char* reason);
 }
 
 #include "symbols.hpp"

src/game/scripting/array.cpp

@@ -60,13 +60,11 @@ namespace scripting
 	array::array()
 	{
 		this->id_ = make_array();
-		this->add();
 	}
 	
 	array::array(std::vector<script_value> values)
 	{
 		this->id_ = make_array();
-		this->add();
 
 		for (const auto& value : values)
 		{
@@ -77,7 +75,6 @@ namespace scripting
 	array::array(std::unordered_map<std::string, script_value> values)
 	{
 		this->id_ = make_array();
-		this->add();
 
 		for (const auto& value : values)
 		{

src/game/structs.hpp

@@ -26,20 +26,35 @@ namespace game
 		const char** argv[8];
 	};
 
+	enum netsrc_t
+	{
+		NS_CLIENT1 = 0x0,
+		NS_CLIENT2 = 0x1,
+		NS_CLIENT3 = 0x2,
+		NS_CLIENT4 = 0x3,
+		NS_MAXCLIENTS = 0x4,
+		NS_SERVER = 0x4,
+		NS_PACKET = 0x5,
+		NS_INVALID_NETSRC = 0x6
+	};
+
 	struct msg_t
 	{
 		int overflowed;
 		int readOnly;
-		char* data;
-		char* splitData;
+		unsigned char* data;
+		unsigned char* splitData;
 		int maxsize;
 		int cursize;
 		int splitSize;
 		int readcount;
 		int bit;
 		int lastEntityRef;
+		netsrc_t targetLocalNetID;
 	};
 
+	static_assert(sizeof(msg_t) == 0x2C);
+
 	struct XZoneInfo
 	{
 		const char* name;
@@ -327,4 +342,88 @@ namespace game
 		int flags;
 		char __pad2[0xEC];
 	};
+
+	enum netadrtype_t
+	{
+		NA_BOT = 0x0,
+		NA_BAD = 0x1,
+		NA_LOOPBACK = 0x2,
+		NA_BROADCAST = 0x3,
+		NA_IP = 0x4
+	};
+
+	struct netadr_s
+	{
+		netadrtype_t type;
+		unsigned char ip[4];
+		unsigned __int16 port;
+		unsigned char ipx[10];
+		unsigned int addrHandleIndex;
+	};
+
+	static_assert(sizeof(netadr_s) == 24);
+
+	struct netchan_t
+	{
+		int outgoingSequence;
+		netsrc_t sock;
+		int dropped;
+		int incomingSequence;
+		netadr_s remoteAddress;
+		int qport;
+		int fragmentSequence;
+		int fragmentLength;
+		unsigned char* fragmentBuffer;
+		int fragmentBufferSize;
+		int unsentFragments;
+		int unsentFragmentStart;
+		int unsentLength;
+		unsigned char* unsentBuffer;
+		int unsentBufferSize;
+		unsigned char __pad0[0x5E0];
+	};
+
+	static_assert(sizeof(netchan_t) == 0x630);
+
+	enum clientState_t
+	{
+		CS_FREE = 0,
+		CS_ZOMBIE = 1,
+		CS_RECONNECTING = 2,
+		CS_CONNECTED = 3,
+		CS_CLIENTLOADING = 4,
+		CS_ACTIVE = 5
+	};
+
+	struct clientHeader_t
+	{
+		clientState_t state; // 0
+		int sendAsActive; // 4
+		int deltaMessage; // 8
+		int rateDealyed; // 12
+		int hasAckedBaselineData; // 16
+		int hugeSnapshotSent; // 20
+		netchan_t netchan; // 24
+		vec3_t predictedOrigin;
+		int predictedOriginServerTime;
+		int migrationState;
+		vec3_t predictedVehicleOrigin;
+		int predictedVehicleServerTime;
+	};
+
+	static_assert(sizeof(clientHeader_t) == 0x66C);
+
+	struct client_s
+	{
+		clientHeader_t header;
+		const char* dropReason;
+		char userinfo[1024];
+		char __pad0[0x41242];
+		unsigned __int16 scriptId; // 269490
+		int bIsTestClient; // 269492
+		int serverId; // 269496
+		char __pad1[0x369DC];
+	};
+
+	static_assert(sizeof(client_s) == 0x78698);
 }

src/game/symbols.hpp

@@ -57,6 +57,7 @@ namespace game
 
 	WEAK symbol<void(int clientNum, int type, const char* command)> SV_GameSendServerCommand{0x573220};
 	WEAK symbol<void(int arg, char* buffer, int bufferLength)> SV_Cmd_ArgvBuffer{0x5459F0};
+	WEAK symbol<void(client_s* drop, const char* reason, bool tellThem)> SV_DropClient{0x570980};
 
 	WEAK symbol<void(unsigned int notifyListOwnerId, unsigned int stringValue, VariableValue* top)> VM_Notify{0x569720};
 	WEAK symbol<unsigned int(unsigned int localId, const char* pos, unsigned int paramcount)> VM_Execute{0x56DFE0};
@@ -79,13 +80,17 @@ namespace game
 	WEAK symbol<gentity_s> g_entities{0x1A66E28};
 	WEAK symbol<unsigned int> levelEntityId{0x208E1A4};
 
+	WEAK symbol<dvar_t> sv_maxclients{0x1BA0E4C};
+	WEAK symbol<int> svs_clientCount{0x4B5CF8C};
+	WEAK symbol<client_s> svs_clients{0x4B5CF90};
+
 	namespace plutonium
 	{
-		WEAK symbol<std::unordered_map<std::string, std::uint16_t>> function_map_rev{0x20693038};
-		WEAK symbol<std::unordered_map<std::string, std::uint16_t>> method_map_rev{0x20693058};
-		WEAK symbol<std::unordered_map<std::string, std::uint16_t>> token_map_rev{0x20693098};
-		WEAK symbol<int(const char* fmt, ...)> printf{0x208879B0};
-		WEAK symbol<void*> function_table{0x2068BCF0};
-		WEAK symbol<void*> method_table{0x2068C4C0};
+		WEAK symbol<std::unordered_map<std::string, std::uint16_t>> function_map_rev{0x2074C520};
+		WEAK symbol<std::unordered_map<std::string, std::uint16_t>> method_map_rev{0x2074C540};
+		WEAK symbol<std::unordered_map<std::string, std::uint16_t>> token_map_rev{0x2074C580};
+		WEAK symbol<int(const char* fmt, ...)> printf{0x2093E120};
+		WEAK symbol<void*> function_table{0x206FAA70};
+		WEAK symbol<void*> method_table{0x206FB240};
 	}
 }