Future/t5-gsc-utils
1
0
Fork 0
mirror of https://github.com/alicealys/t5-gsc-utils.git synced 2025-06-25 13:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add addCommand & executeCommand

Browse Source
This commit is contained in:
Federico Cecchetto
2022-06-11 17:20:59 +02:00
parent f583846c2d
commit cbdc2bfd7f
6 changed files with 205 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/scripting/script_value.cpp
View File

@ -385,8 +385,8 @@ namespace scripting
}
function_argument::function_argument(const arguments& args, const script_value& value, const int index, const bool exists)
: values_(args)
, value_(value)
: script_value(value)
, values_(args)
, index_(index)
, exists_(exists)
{

26
src/game/scripting/script_value.hpp
View File

@ -232,7 +232,7 @@ public: \
class function_argument;
using variadic_args = std::vector<function_argument>;
class function_argument
class function_argument : public script_value
{
public:
function_argument(const arguments& args, const script_value& value, const int index, const bool exists);
@ -247,7 +247,7 @@ public: \
try
{
return this->value_.as<T>();
return script_value::as<T>();
}
catch (const std::exception& e)
{
@ -267,21 +267,6 @@ public: \
return args;
}
std::string to_string() const
{
return this->value_.to_string();
}
std::string type_name() const
{
return this->value_.type_name();
}
script_value get_raw() const
{
return this->value_;
}
operator variadic_args() const
{
variadic_args args{};
@ -296,9 +281,9 @@ public: \
operator C<T, std::allocator<T>>() const
{
const auto container_type = get_c_typename<C<T, std::allocator<T>>>();
if (!this->value_.is<array>())
if (!script_value::as<ArrayType>())
{
const auto type = get_typename(this->value_.get_raw());
const auto type = get_typename(this->get_raw());
throw std::runtime_error(utils::string::va("has type '%s' but should be '%s'",
type.data(),
@ -307,7 +292,7 @@ public: \
}
C<T, std::allocator<T>> container{};
const auto array = this->value_.as<ArrayType>();
const auto array = script_value::as<ArrayType>();
for (auto i = 0; i < array.size(); i++)
{
try
@ -332,7 +317,6 @@ public: \
private:
arguments values_{};
script_value value_{};
int index_{};
bool exists_{};
};

20
src/game/symbols.hpp
View File

@ -9,14 +9,16 @@ namespace game
WEAK symbol<int(const char* str)> BG_StringHashValue{0x0, 0x0};
WEAK symbol<void(int localClientNum, const char* text)> Cbuf_InsertText{0x0, 0x0};
WEAK symbol<void(int localClientNum, const char* text)> Cbuf_AddText{0x0, 0x0};
WEAK symbol<void(int localClientNum, int controllerIndex, const char* text)> Cmd_ExecuteSingleCommand{0x0, 0x0};
WEAK symbol<void(const char* cmdName, void(), cmd_function_t* allocedCmd)> Cmd_AddCommandInternal{0x0, 0x0};
WEAK symbol<void(int localClientNum, const char* text)> Cbuf_AddText{0x49B930, 0x56EF70};
WEAK symbol<void(int localClientNum, int controllerIndex, const char* text)> Cmd_ExecuteSingleCommand{0x619D00, 0x50B470};
WEAK symbol<void(const char* cmdName, void(), cmd_function_t* allocedCmd)> Cmd_AddCommandInternal{0x661400, 0x6AD580};
WEAK symbol<const char*(int index)> Cmd_Argv{0x0, 0x0};
WEAK symbol<void(const char* cmdName)> Cmd_RemoveCommand{0x0, 0x0};
WEAK symbol<void(const char* cmdName)> Cmd_RemoveCommand{0x5F1A90, 0x527EA0};
WEAK symbol<void(int clientNum)> ClientUserInfoChanged{0x0, 0x0};
WEAK symbol<int(const char* fmt, ...)> Com_Printf{0x566BC0, 0x64C260};
WEAK symbol<const dvar_t*(const char*)> Dvar_FindVar{0x0, 0x0};
WEAK symbol<int(const dvar_t*)> Dvar_GetInt{0x0, 0x0};
WEAK symbol<dvar_t*(const char* dvarName, int value, int min, int max,
@ -40,8 +42,8 @@ namespace game
WEAK symbol<void(scriptInstance_t inst)> Scr_ClearOutParams{0x654D10, 0x588680};
WEAK symbol<unsigned int(scriptInstance_t inst)> AllocObject{0x0, 0x0};
WEAK symbol<unsigned int(scriptInstance_t inst, unsigned int id)> AllocThread{0x0, 0x0};
WEAK symbol<void(scriptInstance_t inst, unsigned int id)> RemoveRefToObject{0x0, 0x0};
WEAK symbol<unsigned int(scriptInstance_t inst, unsigned int id)> AllocThread{0x69E140, 0x43CA60};
WEAK symbol<void(scriptInstance_t inst, unsigned int id)> RemoveRefToObject{0x5517B0, 0x698FA0};
WEAK symbol<void(scriptInstance_t inst, const float* vectorValue)> RemoveRefToVector{0x0, 0x0};
WEAK symbol<void(scriptInstance_t inst, const int type, VariableUnion value)> AddRefToValue_{0x53FD50, 0x6706B0};
@ -95,13 +97,13 @@ namespace game
WEAK symbol<gentity_s*(scr_entref_t entref)> GetPlayerEntity{0x0, 0x0};
WEAK symbol<unsigned int(scriptInstance_t inst, unsigned int localId, const char* pos, unsigned int paramcount)> VM_Execute{0x0, 0x0};
WEAK symbol<unsigned int(scriptInstance_t inst, unsigned int localId, const char* pos, unsigned int paramcount)> VM_Execute{0x8ACE60, 0x8EADE0};
WEAK symbol<void(int clientNum, const char* reason)> SV_GameDropClient{0x0, 0x0};
WEAK symbol<bool(int clientNum)> SV_IsTestClient{0x0, 0x0};
WEAK symbol<void(int clientNum, int type, const char* command)> SV_GameSendServerCommand{0x0, 0x0};
WEAK symbol<void*(int valueIndex)> Sys_GetValue{0x0, 0x0};
WEAK symbol<void*(int valueIndex)> Sys_GetValue{0x67D4F0, 0x529EB0};
WEAK symbol<int()> Sys_Milliseconds{0x0, 0x0};
WEAK symbol<void*(jmp_buf* Buf, int Value)> longjmp{0x96B980, 0x9D05C4};
@ -123,7 +125,7 @@ namespace game
WEAK symbol<scr_classStruct_t*> g_classMap{0x0, 0x0};
WEAK symbol<gentity_s> g_entities{0x0, 0x0};
WEAK symbol<unsigned int> levelEntityId{0x0, 0x0};
WEAK symbol<unsigned int> levelEntityId{0x32C86A0, 0x3DCB2A0};
WEAK symbol<client_s> svs_clients{0x0, 0x0};
}