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

[Script]: Add method to clear text in HudElems (#604)

Browse Source
This commit is contained in:
Edo 2022-11-27 19:20:07 +00:00 committed by GitHub
parent 3b8aa2563b
commit 49d5e84372
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 135 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Components/Modules/AssetInterfaces/IXAnimParts.cpp
View File

@ -39,7 +39,7 @@ namespace Assets
xanim->names = builder->getAllocator()->allocateArray<unsigned short>(xanim->boneCount[Game::PART_TYPE_ALL]);
for (int i = 0; i < xanim->boneCount[Game::PART_TYPE_ALL]; ++i)
{
xanim->names[i] = Game::SL_GetString(reader.readCString(), 0);
xanim->names[i] = static_cast<std::uint16_t>(Game::SL_GetString(reader.readCString(), 0));
}
}
@ -49,7 +49,7 @@ namespace Assets
for (int i = 0; i < xanim->notifyCount; ++i)
{
xanim->notify[i].name = Game::SL_GetString(reader.readCString(), 0);
xanim->notify[i].name = static_cast<std::uint16_t>(Game::SL_GetString(reader.readCString(), 0));
}
}

2
src/Components/Modules/AssetInterfaces/IXModel.cpp
View File

@ -128,7 +128,7 @@ namespace Assets
for (char i = 0; i < asset->numBones; ++i)
{
asset->boneNames[i] = Game::SL_GetString(reader.readCString(), 0);
asset->boneNames[i] = static_cast<std::uint16_t>(Game::SL_GetString(reader.readCString(), 0));
}
}

4
src/Components/Modules/Bots.cpp
View File

@ -96,13 +96,13 @@ namespace Components
{
Game::Scr_AddString("autoassign");
Game::Scr_AddString("team_marinesopfor");
Game::Scr_Notify(ent, Game::SL_GetString("menuresponse", 0), 2);
Game::Scr_Notify(ent, static_cast<std::uint16_t>(Game::SL_GetString("menuresponse", 0)), 2);
Scheduler::Once([ent]
{
Game::Scr_AddString(Utils::String::VA("class%u", Utils::Cryptography::Rand::GenerateInt() % 5u));
Game::Scr_AddString("changeclass");
Game::Scr_Notify(ent, Game::SL_GetString("menuresponse", 0), 2);
Game::Scr_Notify(ent, static_cast<std::uint16_t>(Game::SL_GetString("menuresponse", 0)), 2);
}, Scheduler::Pipeline::SERVER, 1s);
}, Scheduler::Pipeline::SERVER, 1s);

2
src/Components/Modules/Chat.cpp
View File

@ -73,7 +73,7 @@ namespace Components
Game::Scr_AddEntity(player);
Game::Scr_AddString(text + msgIndex);
Game::Scr_NotifyLevel(Game::SL_GetString("say", 0), 2);
Game::Scr_NotifyLevel(static_cast<std::uint16_t>(Game::SL_GetString("say", 0)), 2);
return text;
}

6
src/Components/Modules/FileSystem.cpp
View File

@ -78,19 +78,19 @@ namespace Components
Utils::Memory::Allocator allocator;
if (!this->exists()) return std::string();
int position = Game::FS_FTell(this->handle);
const auto position = Game::FS_FTell(this->handle);
this->seek(0, Game::FS_SEEK_SET);
char* buffer = allocator.allocateArray<char>(this->size);
if (!this->read(buffer, this->size))
{
this->seek(position, Game::FS_SEEK_SET);
return std::string();
return {};
}
this->seek(position, Game::FS_SEEK_SET);
return std::string(buffer, this->size);
return {buffer, static_cast<std::size_t>(this->size)};
}
bool FileSystem::FileReader::read(void* buffer, size_t _size)

2
src/Components/Modules/GSC/GSC.cpp
View File

@ -4,6 +4,7 @@
#include "IO.hpp"
#include "Script.hpp"
#include "ScriptExtension.hpp"
#include "ScriptPatches.hpp"
#include "ScriptStorage.hpp"
namespace Components
@ -14,6 +15,7 @@ namespace Components
Loader::Register(new IO());
Loader::Register(new Script());
Loader::Register(new ScriptExtension());
Loader::Register(new ScriptPatches());
Loader::Register(new ScriptStorage());
}
}

2
src/Components/Modules/GSC/IO.cpp
View File

@ -126,7 +126,7 @@ namespace Components
}
}
const auto p = "scriptdata" / std::filesystem::path(path);
const auto p = "scriptdata"s / std::filesystem::path(path);
const auto folder = p.parent_path().string();
const auto file = p.filename().string();
Game::Scr_AddInt(FileSystem::_DeleteFile(folder, file));

36
src/Components/Modules/GSC/ScriptPatches.cpp Normal file
View File

@ -0,0 +1,36 @@
#include <STDInclude.hpp>
#include "ScriptPatches.hpp"
#include "Script.hpp"
using namespace Utils::String;
namespace Components
{
constexpr auto offset = 511;
Game::game_hudelem_s* ScriptPatches::HECmd_GetHudElem(Game::scr_entref_t entref)
{
if (entref.classnum != 1)
{
Game::Scr_ObjectError("not a hud element");
return nullptr;
}
assert(entref.entnum < 1024);
return &Game::g_hudelems[entref.entnum];
}
ScriptPatches::ScriptPatches()
{
Script::AddMethod("ClearHudText", [](Game::scr_entref_t entref) -> void
{
auto* hud = HECmd_GetHudElem(entref);
// Frees config string up
if ((hud->elem).text)
{
Game::SV_SetConfigstring((hud->elem).text + offset, nullptr);
}
});
}
}

13
src/Components/Modules/GSC/ScriptPatches.hpp Normal file
View File

@ -0,0 +1,13 @@
#pragma once
namespace Components
{
class ScriptPatches : public Component
{
public:
ScriptPatches();
private:
static Game::game_hudelem_s* HECmd_GetHudElem(Game::scr_entref_t entref);
};
}

2
src/Components/Modules/ZoneBuilder.cpp
View File

@ -576,7 +576,7 @@ namespace Components
int ZoneBuilder::Zone::addScriptString(const std::string& str)
{
return this->addScriptString(Game::SL_GetString(str.data(), 0));
return this->addScriptString(static_cast<std::uint16_t>(Game::SL_GetString(str.data(), 0)));
}
// Mark a scriptString for writing and map it.

5
src/Game/Functions.cpp
View File

@ -168,11 +168,6 @@ namespace Game
Dvar_SetFloat_t Dvar_SetFloat = Dvar_SetFloat_t(0x40BB20);
Dvar_SetInt_t Dvar_SetInt = Dvar_SetInt_t(0x421DA0);
SL_ConvertToString_t SL_ConvertToString = SL_ConvertToString_t(0x4EC1D0);
SL_GetString_t SL_GetString = SL_GetString_t(0x4CDC10);
SL_AddRefToString_t SL_AddRefToString = SL_AddRefToString_t(0x4D9B00);
SL_RemoveRefToString_t SL_RemoveRefToString = SL_RemoveRefToString_t(0x47CD70);
SND_Init_t SND_Init = SND_Init_t(0x46A630);
SND_InitDriver_t SND_InitDriver = SND_InitDriver_t(0x4F5090);

12
src/Game/Functions.hpp
View File

@ -389,18 +389,6 @@ namespace Game
typedef int(*SEH_GetCurrentLanguage_t)();
extern SEH_GetCurrentLanguage_t SEH_GetCurrentLanguage;
typedef const char*(*SL_ConvertToString_t)(scr_string_t stringValue);
extern SL_ConvertToString_t SL_ConvertToString;
typedef short(*SL_GetString_t)(const char *str, unsigned int user);
extern SL_GetString_t SL_GetString;
typedef void(*SL_AddRefToString_t)(unsigned int stringValue);
extern SL_AddRefToString_t SL_AddRefToString;
typedef void(*SL_RemoveRefToString_t)(unsigned int stringValue);
extern SL_RemoveRefToString_t SL_RemoveRefToString;
typedef void(*SND_Init_t)(int a1, int a2, int a3);
extern SND_Init_t SND_Init;

4
src/Game/Game.cpp
View File

@ -12,8 +12,12 @@ namespace Game
G_PrintEntities_t G_PrintEntities = G_PrintEntities_t(0x4E6A50);
G_GetEntityTypeName_t G_GetEntityTypeName = G_GetEntityTypeName_t(0x4EB810);
G_LocalizedStringIndex_t G_LocalizedStringIndex = G_LocalizedStringIndex_t(0x4582F0);
gentity_t* g_entities = reinterpret_cast<gentity_t*>(0x18835D8);
const char* origErrorMsg = reinterpret_cast<const char*>(0x79B124);
XModel* G_GetModel(const int index)
{
assert(index > 0);

5
src/Game/Game.hpp
View File

@ -40,9 +40,14 @@ namespace Game
typedef const char*(*G_GetEntityTypeName_t)(const gentity_s* ent);
extern G_GetEntityTypeName_t G_GetEntityTypeName;
typedef int(*G_LocalizedStringIndex_t)(const char* string);
extern G_LocalizedStringIndex_t G_LocalizedStringIndex;
constexpr std::size_t MAX_GENTITIES = 2048;
constexpr std::size_t ENTITYNUM_NONE = MAX_GENTITIES - 1;
extern gentity_t* g_entities;
extern const char* origErrorMsg;
extern XModel* G_GetModel(int index);
}

14
src/Game/Script.cpp
View File

@ -56,6 +56,10 @@ namespace Game
Scr_SetClientField_t Scr_SetClientField = Scr_SetClientField_t(0x4A6DF0);
Scr_AddClassField_t Scr_AddClassField = Scr_AddClassField_t(0x4C0E70);
Scr_ConstructMessageString_t Scr_ConstructMessageString = Scr_ConstructMessageString_t(0x45F940);
Scr_FreeHudElemConstStrings_t Scr_FreeHudElemConstStrings = Scr_FreeHudElemConstStrings_t(0x5E1120);
GetEntity_t GetEntity = GetEntity_t(0x4BC270);
GetPlayerEntity_t GetPlayerEntity = GetPlayerEntity_t(0x49C4A0);
@ -63,11 +67,21 @@ namespace Game
Scr_ShutdownAllocNode_t Scr_ShutdownAllocNode = Scr_ShutdownAllocNode_t(0x441650);
Scr_IsSystemActive_t Scr_IsSystemActive = Scr_IsSystemActive_t(0x4B24E0);
SL_ConvertToString_t SL_ConvertToString = SL_ConvertToString_t(0x4EC1D0);
SL_GetString_t SL_GetString = SL_GetString_t(0x4CDC10);
SL_GetString__t SL_GetString_ = SL_GetString__t(0x47E310);
SL_FindString_t SL_FindString = SL_FindString_t(0x434EE0);
SL_FindLowercaseString_t SL_FindLowercaseString = SL_FindLowercaseString_t(0x4C63E0);
SL_AddRefToString_t SL_AddRefToString = SL_AddRefToString_t(0x4D9B00);
SL_RemoveRefToString_t SL_RemoveRefToString = SL_RemoveRefToString_t(0x47CD70);
scr_const_t* scr_const = reinterpret_cast<scr_const_t*>(0x1AA2E00);
scrVmPub_t* scrVmPub = reinterpret_cast<scrVmPub_t*>(0x2040CF0);
scrVarPub_t* scrVarPub = reinterpret_cast<scrVarPub_t*>(0x201A408);
game_hudelem_s* g_hudelems = reinterpret_cast<game_hudelem_s*>(0x18565A8);
void IncInParam()
{
Scr_ClearOutParams();

33
src/Game/Script.hpp
View File

@ -119,10 +119,10 @@ namespace Game
typedef int(*Scr_GetPointerType_t)(unsigned int index);
extern Scr_GetPointerType_t Scr_GetPointerType;
typedef void(*Scr_Error_t)(const char*);
typedef void(*Scr_Error_t)(const char* error);
extern Scr_Error_t Scr_Error;
typedef void(*Scr_ObjectError_t)(const char*);
typedef void(*Scr_ObjectError_t)(const char* error);
extern Scr_ObjectError_t Scr_ObjectError;
typedef void(*Scr_ParamError_t)(unsigned int paramIndex, const char*);
@ -143,12 +143,39 @@ namespace Game
typedef void(*Scr_AddClassField_t)(unsigned int classnum, const char* name, unsigned int offset);
extern Scr_AddClassField_t Scr_AddClassField;
typedef void(*Scr_ConstructMessageString_t)(int firstParmIndex, int lastParmIndex, const char* errorContext, char* string, unsigned int stringLimit);
extern Scr_ConstructMessageString_t Scr_ConstructMessageString;
typedef void(*Scr_FreeHudElemConstStrings_t)(game_hudelem_s* hud);
extern Scr_FreeHudElemConstStrings_t Scr_FreeHudElemConstStrings;
typedef gentity_s*(*GetPlayerEntity_t)(scr_entref_t entref);
extern GetPlayerEntity_t GetPlayerEntity;
typedef gentity_s*(*GetEntity_t)(scr_entref_t entref);
extern GetEntity_t GetEntity;
typedef const char*(*SL_ConvertToString_t)(scr_string_t stringValue);
extern SL_ConvertToString_t SL_ConvertToString;
typedef unsigned int(*SL_GetString_t)(const char* str, unsigned int user);
extern SL_GetString_t SL_GetString;
typedef unsigned int(*SL_GetString__t)(const char* str, unsigned int user, int type);
extern SL_GetString__t SL_GetString_;
typedef unsigned int(*SL_FindString_t)(const char* name);
extern SL_FindString_t SL_FindString;
typedef unsigned int(*SL_FindLowercaseString_t)(const char* str);
extern SL_FindLowercaseString_t SL_FindLowercaseString;
typedef void(*SL_AddRefToString_t)(unsigned int stringValue);
extern SL_AddRefToString_t SL_AddRefToString;
typedef void(*SL_RemoveRefToString_t)(unsigned int stringValue);
extern SL_RemoveRefToString_t SL_RemoveRefToString;
extern void IncInParam();
extern void Scr_AddBool(int value);
@ -161,4 +188,6 @@ namespace Game
extern scrVmPub_t* scrVmPub;
extern scrVarPub_t* scrVarPub;
extern game_hudelem_s* g_hudelems;
}

4
src/Game/Server.cpp
View File

@ -12,6 +12,7 @@ namespace Game
SV_Cmd_ArgvBuffer_t SV_Cmd_ArgvBuffer = SV_Cmd_ArgvBuffer_t(0x40BB60);
SV_DirectConnect_t SV_DirectConnect = SV_DirectConnect_t(0x460480);
SV_SetConfigstring_t SV_SetConfigstring = SV_SetConfigstring_t(0x4982E0);
SV_GetConfigstringConst_t SV_GetConfigstringConst = SV_GetConfigstringConst_t(0x468500);
SV_Loaded_t SV_Loaded = SV_Loaded_t(0x4EE3E0);
SV_ClientThink_t SV_ClientThink = SV_ClientThink_t(0x44ADD0);
SV_DropClient_t SV_DropClient = SV_DropClient_t(0x4D1600);
@ -25,6 +26,9 @@ namespace Game
int* svs_clientCount = reinterpret_cast<int*>(0x31D938C);
client_t* svs_clients = reinterpret_cast<client_t*>(0x31D9390);
unsigned short* sv_sconfigstrings = reinterpret_cast<unsigned short*>(0x208A632);
unsigned short* sv_emptyConfigString = reinterpret_cast<unsigned short*>(0x208A630);
volatile long* sv_thread_owns_game = reinterpret_cast<volatile long*>(0x2089DB8);
int SV_GetServerThreadOwnsGame()

6
src/Game/Server.hpp
View File

@ -29,6 +29,9 @@ namespace Game
typedef void(*SV_SetConfigstring_t)(int index, const char* string);
extern SV_SetConfigstring_t SV_SetConfigstring;
typedef unsigned int(*SV_GetConfigstringConst_t)(int index);
extern SV_GetConfigstringConst_t SV_GetConfigstringConst;
typedef void(*SV_DirectConnect_t)(netadr_t adr);
extern SV_DirectConnect_t SV_DirectConnect;
@ -58,6 +61,9 @@ namespace Game
extern int* svs_clientCount;
extern client_t* svs_clients;
extern unsigned short* sv_sconfigstrings;
extern unsigned short* sv_emptyConfigString;
extern volatile long* sv_thread_owns_game;
extern int SV_GetServerThreadOwnsGame();

9
src/Game/Structs.hpp
View File

@ -272,6 +272,7 @@ namespace Game
CS_VOTE_NO = 0x14,
CS_VOTE_MAPNAME = 0x15,
CS_VOTE_GAMETYPE = 0x16,
CS_SHELLSHOCKS = 0x985,
CS_ITEMS = 0x102A,
}; // Incomplete
@ -1290,6 +1291,14 @@ namespace Game
int flags;
};
struct game_hudelem_s
{
hudelem_s elem;
int clientNum;
int team;
int archived;
};
enum
{
PMF_PRONE = 1 << 0,