22 Commits

Author SHA1 Message Date
fed
12562eb8fd Merge pull request #13 from diamante0018/main
Clean up gsc functions with additional checks
2022-02-25 12:04:16 +01:00
286481cbcd Clean up gsc functions with additional checks 2022-02-24 19:25:58 +00:00
e9a877bd74 Update dllmain.cpp 2022-02-11 19:35:46 +01:00
3060df1f05 Update pointers 2022-02-07 02:00:15 +01:00
fed
aa1ae8c574 Merge pull request #12 from diamante0018/main 2022-02-02 15:25:52 +01:00
ccd8176c25 Remove assert 2022-02-02 15:24:20 +01:00
c230a1d916 Remove incorrect offset comments 2022-02-02 12:47:46 +01:00
2785a60dc0 Add function drop all bots 2022-02-02 12:45:07 +01:00
1b65bda323 Update pointers 2022-01-29 16:37:04 +01:00
9ca07aca55 Update pointers 2022-01-23 22:09:40 +01:00
fed
10b45027d0 Merge pull request #10 from diamante0018/main
Add isBot function
2022-01-06 22:08:45 +01:00
d5c0063fee Add isBot function 2022-01-06 22:04:19 +01:00
31920b0692 Some fixes 2021-12-27 21:03:29 +01:00
fed
89e4edc00b Fix 2021-12-14 10:03:59 +01:00
fed
379a21ff7e Small fix 2021-12-13 08:06:24 +01:00
0ac5225114 #5 2021-12-13 03:05:22 +01:00
e918bdf28f Update dllmain.cpp 2021-12-02 00:42:58 +01:00
fed
50b83787e7 Update pointers 2021-12-02 00:38:28 +01:00
e6ca925562 Fix setjmp 2021-11-15 22:06:44 +01:00
0f92a7ce25 Fixes for pluto update 2021-11-09 23:55:25 +01:00
d4d91de80f Small change 2021-11-09 22:48:15 +01:00
a508a7e3a4 Also function 2021-11-08 01:42:55 +01:00
18 changed files with 292 additions and 83 deletions

View File

@ -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
{
}
};
}

View File

@ -93,7 +93,7 @@ namespace gsc
{
if (id < 0x200)
{
return reinterpret_cast<builtin_function*>(0x20689DD8)[id]();
return reinterpret_cast<builtin_function*>(game::plutonium::function_table.get())[id]();
}
try
@ -119,7 +119,7 @@ namespace gsc
{
if (id < 0x8400)
{
return reinterpret_cast<builtin_method*>(0x2068A5A8)[id - 0x8000](ent);
return reinterpret_cast<builtin_method*>(game::plutonium::method_table.get())[id - 0x8000](ent);
}
try
@ -270,7 +270,7 @@ namespace gsc
namespace field
{
void add(classid classnum, const std::string& name,
void add(const classid classnum, const std::string& name,
const std::function<scripting::script_value(unsigned int entnum)>& getter,
const std::function<void(unsigned int entnum, const scripting::script_value&)>& setter)
{
@ -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);
}

View File

@ -1,4 +1,6 @@
#pragma once
#include "game/scripting/array.hpp"
#include "game/scripting/execution.hpp"
namespace gsc
{
@ -46,7 +48,7 @@ namespace gsc
namespace field
{
void add(classid classnum, const std::string& name,
void add(const classid classnum, const std::string& name,
const std::function<scripting::script_value(unsigned int entnum)>& getter,
const std::function<void(unsigned int entnum, const scripting::script_value&)>& setter);
}

View File

@ -2,12 +2,6 @@
#include "loader/component_loader.hpp"
#include "scheduler.hpp"
#include "game/scripting/event.hpp"
#include "game/scripting/execution.hpp"
#include "game/scripting/functions.hpp"
#include "game/scripting/array.hpp"
#include "gsc.hpp"
#include "json.hpp"

View File

@ -2,12 +2,6 @@
#include "loader/component_loader.hpp"
#include "scheduler.hpp"
#include "game/scripting/event.hpp"
#include "game/scripting/execution.hpp"
#include "game/scripting/functions.hpp"
#include "game/scripting/array.hpp"
#include "gsc.hpp"
#include "json.hpp"

View File

@ -1,35 +1,51 @@
#include <stdinc.hpp>
#include "loader/component_loader.hpp"
#include "scheduler.hpp"
#include "game/scripting/entity.hpp"
#include "game/scripting/execution.hpp"
#include "scheduler.hpp"
#include "gsc.hpp"
#include "scripting.hpp"
namespace notifies
{
namespace
{
std::vector<scripting::function> say_callbacks;
utils::hook::detour client_command_hook;
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);
auto hidden = false;
if (cmd == "say"s || cmd == "say_team"s)
{
std::string message = game::ConcatArgs(1);
message.erase(0, 1);
const scripting::entity level{*game::levelEntityId};
const auto player = scripting::call("getEntByNum", {clientNum}).as<scripting::entity>();
for (const auto& callback : say_callbacks)
{
const auto entity_id = game::Scr_GetEntityId(clientNum, 0);
const auto result = callback(entity_id, {message, cmd == "say_team"s});
scripting::notify(level, cmd, {player, message});
scripting::notify(player, cmd, {message});
if (result.is<int>() && !hidden)
{
hidden = result.as<int>() == 0;
}
}
}
return client_command_hook.invoke<void>(clientNum);
if (!hidden)
{
client_command_hook.invoke<void>(clientNum);
}
}
}
@ -39,6 +55,18 @@ namespace notifies
void post_unpack() override
{
client_command_hook.create(0x502CB0, client_command_stub);
scripting::on_shutdown([]()
{
say_callbacks.clear();
});
gsc::function::add("onplayersay", [](const gsc::function_args& args) -> scripting::script_value
{
const auto function = args[0].as<scripting::function>();
say_callbacks.push_back(function);
return {};
});
}
};
}

View File

@ -29,6 +29,8 @@ namespace scripting
std::string current_file;
std::vector<std::function<void()>> shutdown_callbacks;
void vm_notify_stub(const unsigned int notify_list_owner_id, const unsigned int string_value,
game::VariableValue* top)
{
@ -77,6 +79,12 @@ namespace scripting
{
userinfo::clear_overrides();
command::clear_script_commands();
for (const auto& callback : shutdown_callbacks)
{
callback();
}
g_shutdown_game_hook.invoke<void>(free_scripts);
}
@ -106,6 +114,11 @@ namespace scripting
}
}
void on_shutdown(const std::function<void()>& callback)
{
shutdown_callbacks.push_back(callback);
}
class component final : public component_interface
{
public:

View File

@ -4,4 +4,6 @@ namespace scripting
{
extern std::unordered_map<int, std::unordered_map<std::string, int>> fields_table;
extern std::unordered_map<std::string, std::unordered_map<std::string, const char*>> script_function_table;
void on_shutdown(const std::function<void()>& callback);
}

View File

@ -2,12 +2,6 @@
#include "loader/component_loader.hpp"
#include "scheduler.hpp"
#include "game/scripting/event.hpp"
#include "game/scripting/execution.hpp"
#include "game/scripting/functions.hpp"
#include "game/scripting/array.hpp"
#include "gsc.hpp"
namespace userinfo
@ -19,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];
}
@ -34,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)
{
@ -49,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())
{
@ -94,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);
@ -109,13 +112,16 @@ namespace userinfo
gsc::method::add("resetname", [](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");
}
userinfo_overrides[ent.entnum].erase("name");
game::ClientUserinfoChanged(ent.entnum);
@ -124,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";
@ -141,13 +152,16 @@ namespace userinfo
gsc::method::add("resetclantag", [](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");
}
userinfo_overrides[ent.entnum].erase("clantag");
userinfo_overrides[ent.entnum].erase("ec_TagText");
userinfo_overrides[ent.entnum].erase("ec_usingTag");
@ -158,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";

View File

@ -5,16 +5,18 @@ 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*>(0x20800000);
if (value != 0xB9C9566)
const auto value = *reinterpret_cast<DWORD*>(0x21600000);
if (value != 0x8A94852)
{
printf("\x1b[31m\n**************************************************************************************\n\n");
printf("This version of \x1b[33miw5-gsc-utils\x1b[31m is outdated.\n");
printf("Download the latest dll from here:\x1b[34m https://github.com/fedddddd/iw5-gsc-utils/releases \x1b[31m\n");
printf("\n**************************************************************************************\n\n\x1b[37m");
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);
return FALSE;
}
utils::hook::jump(reinterpret_cast<uintptr_t>(&printf), game::plutonium::printf);
component_loader::post_unpack();
}

View File

@ -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);
}
}
}

View File

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

View File

@ -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)
{

View File

@ -59,8 +59,8 @@ namespace scripting
script_function get_function_by_index(const unsigned index)
{
static const auto function_table = 0x20689DD8;
static const auto method_table = 0x2068A5A8;
static const auto function_table = game::plutonium::function_table.get();
static const auto method_table = game::plutonium::method_table.get();
if (index < 0x1C7)
{

View File

@ -25,7 +25,7 @@ namespace scripting::safe_execution
bool call(const script_function function, const game::scr_entref_t& entref)
{
*game::g_script_error_level += 1;
if (game::_setjmp(&game::g_script_error[*game::g_script_error_level]))
if (game::_setjmp(&game::g_script_error[*game::g_script_error_level], 0, 0, 0))
{
*game::g_script_error_level -= 1;
return false;
@ -39,7 +39,7 @@ namespace scripting::safe_execution
bool set_entity_field(const game::scr_entref_t& entref, const int offset)
{
*game::g_script_error_level += 1;
if (game::_setjmp(&game::g_script_error[*game::g_script_error_level]))
if (game::_setjmp(&game::g_script_error[*game::g_script_error_level], 0, 0, 0))
{
*game::g_script_error_level -= 1;
return false;
@ -54,7 +54,7 @@ namespace scripting::safe_execution
bool get_entity_field(const game::scr_entref_t& entref, const int offset, game::VariableValue* value)
{
*game::g_script_error_level += 1;
if (game::_setjmp(&game::g_script_error[*game::g_script_error_level]))
if (game::_setjmp(&game::g_script_error[*game::g_script_error_level], 0, 0, 0))
{
value->type = game::SCRIPT_NONE;
value->u.intValue = 0;

View File

@ -82,6 +82,11 @@ namespace scripting
return "array";
}
if (info == typeid(function))
{
return "function";
}
if (info == typeid(vector))
{
return "vector";

View File

@ -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);
}

View File

@ -57,12 +57,13 @@ 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};
WEAK symbol<void* (jmp_buf* Buf, int Value)> longjmp{0x7363BC};
WEAK symbol<int(jmp_buf* Buf)> _setjmp{0x734CF8};
WEAK symbol<int(jmp_buf* Buf, int a2, int a3, int a4)> _setjmp{0x734CF8};
// Variables
@ -79,10 +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{0x20691228};
WEAK symbol<std::unordered_map<std::string, std::uint16_t>> method_map_rev{0x20691248};
WEAK symbol<std::unordered_map<std::string, std::uint16_t>> token_map_rev{0x20691288};
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};
}
}