Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[ClientCommand]: Improve GSC methods (#962)

Browse Source
This commit is contained in:
Edo 2023-04-22 14:58:15 +02:00 committed by GitHub
parent 4dcbe32c54
commit 42e5132c5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Components/Modules/ClientCommand.cpp
View File

@ -9,11 +9,23 @@ namespace Components
{ {
std::unordered_map<std::string, std::function<void(Game::gentity_s*, const Command::ServerParams*)>> ClientCommand::HandlersSV; std::unordered_map<std::string, std::function<void(Game::gentity_s*, const Command::ServerParams*)>> ClientCommand::HandlersSV;
bool ClientCommand::CheatsEnabled;
ClientCommand::CheatsScopedLock::CheatsScopedLock()
{
CheatsEnabled = true;
}
ClientCommand::CheatsScopedLock::~CheatsScopedLock()
{
CheatsEnabled = false;
}
bool ClientCommand::CheatsOk(const Game::gentity_s* ent) bool ClientCommand::CheatsOk(const Game::gentity_s* ent)
{ {
const auto entNum = ent->s.number; const auto entNum = ent->s.number;
if (!(*Game::g_cheats)->current.enabled) if (!(*Game::g_cheats)->current.enabled && !CheatsEnabled)
{ {
Logger::Debug("Cheats are disabled!"); Logger::Debug("Cheats are disabled!");
Game::SV_GameSendServerCommand(entNum, Game::SV_CMD_CAN_IGNORE, VA("%c \"GAME_CHEATSNOTENABLED\"", 0x65)); Game::SV_GameSendServerCommand(entNum, Game::SV_CMD_CAN_IGNORE, VA("%c \"GAME_CHEATSNOTENABLED\"", 0x65));
@ -351,12 +363,16 @@ namespace Components
GSC::Script::AddMethod("Noclip", [](const Game::scr_entref_t entref) // gsc: self Noclip(); GSC::Script::AddMethod("Noclip", [](const Game::scr_entref_t entref) // gsc: self Noclip();
{ {
auto* ent = GSC::Script::Scr_GetPlayerEntity(entref); auto* ent = GSC::Script::Scr_GetPlayerEntity(entref);
CheatsScopedLock cheatsLock;
Cmd_Noclip_f(ent, nullptr); Cmd_Noclip_f(ent, nullptr);
}); });
GSC::Script::AddMethod("Ufo", [](const Game::scr_entref_t entref) // gsc: self Ufo(); GSC::Script::AddMethod("Ufo", [](const Game::scr_entref_t entref) // gsc: self Ufo();
{ {
auto* ent = GSC::Script::Scr_GetPlayerEntity(entref); auto* ent = GSC::Script::Scr_GetPlayerEntity(entref);
CheatsScopedLock cheatsLock;
Cmd_UFO_f(ent, nullptr); Cmd_UFO_f(ent, nullptr);
}); });
} }
@ -502,6 +518,8 @@ namespace Components
// Hook call to ClientCommand in SV_ExecuteClientCommand so we may add custom commands // Hook call to ClientCommand in SV_ExecuteClientCommand so we may add custom commands
Utils::Hook(0x6259FA, ClientCommandStub, HOOK_CALL).install()->quick(); Utils::Hook(0x6259FA, ClientCommandStub, HOOK_CALL).install()->quick();
CheatsEnabled = false;
AddCheatCommands(); AddCheatCommands();
AddScriptFunctions(); AddScriptFunctions();
AddScriptMethods(); AddScriptMethods();

9
src/Components/Modules/ClientCommand.hpp
View File

@ -13,6 +13,15 @@ namespace Components
private: private:
static std::unordered_map<std::string, std::function<void(Game::gentity_s*, const Command::ServerParams*)>> HandlersSV; static std::unordered_map<std::string, std::function<void(Game::gentity_s*, const Command::ServerParams*)>> HandlersSV;
static bool CheatsEnabled;
class CheatsScopedLock
{
public:
CheatsScopedLock();
~CheatsScopedLock();
};
static void ClientCommandStub(int clientNum); static void ClientCommandStub(int clientNum);
static void AddCheatCommands(); static void AddCheatCommands();
static void AddDevelopmentCommands(); static void AddDevelopmentCommands();