Merge pull request #10 from diamante0018/main

Add isBot function

src/component/gsc.cpp

@@ -416,6 +416,22 @@ namespace gsc
 				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("entity is not a player");
+				}
+
+				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

@@ -29,7 +29,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())
 			{

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

@@ -327,4 +327,15 @@ namespace game
 		int flags;
 		char __pad2[0xEC];
 	};
+
+	struct client_s
+	{
+		char __pad0[0x41CB2];
+		unsigned __int16 scriptId; // 269490
+		int bIsTestClient; // 269492
+		int serverId; // 269496
+		char __pad1[0x369DC];
+	};
+
+	static_assert(sizeof(client_s) == 0x78698);
 }

src/game/symbols.hpp

@@ -79,6 +79,8 @@ namespace game
 	WEAK symbol<gentity_s> g_entities{0x1A66E28};
 	WEAK symbol<unsigned int> levelEntityId{0x208E1A4};
 
+	WEAK symbol<client_s> svs_clients{0x4B5CF90};
+
 	namespace plutonium
 	{
 		WEAK symbol<std::unordered_map<std::string, std::uint16_t>> function_map_rev{0x20693038};