From da59ed854c12a93548d12483d3f8e585c311dd8f Mon Sep 17 00:00:00 2001 From: m Date: Wed, 26 Oct 2022 22:22:45 -0500 Subject: [PATCH] fixes and little changes --- src/client/component/gsc/script_extension.cpp | 28 ++++++++++------- src/client/component/io.cpp | 10 +++--- src/client/component/json.cpp | 2 +- src/client/game/scripting/script_value.hpp | 27 ++++++++-------- src/client/game/structs.hpp | 31 +++++++++---------- 5 files changed, 51 insertions(+), 47 deletions(-) diff --git a/src/client/component/gsc/script_extension.cpp b/src/client/component/gsc/script_extension.cpp index 009613d8..56682adf 100644 --- a/src/client/component/gsc/script_extension.cpp +++ b/src/client/component/gsc/script_extension.cpp @@ -33,11 +33,6 @@ namespace gsc namespace { - struct gsc_error : public std::runtime_error - { - using std::runtime_error::runtime_error; - }; - std::unordered_map functions; std::unordered_map methods; @@ -264,6 +259,11 @@ namespace gsc } console::info("%s\n", buffer.data()); } + + scripting::script_value typeof(const function_args& args) + { + return args[0].type_name(); + } } namespace function @@ -365,6 +365,15 @@ namespace gsc utils::hook::call(SELECT_VALUE(0x3CC9F3_b, 0x513A53_b), vm_error_stub); + if (game::environment::is_dedi()) + { + function::add("isusingmatchrulesdata", [](const function_args& args) + { + // return 0 so the game doesn't override the cfg + return 0; + }); + } + function::add("print", [](const function_args& args) { print(args); @@ -457,12 +466,6 @@ namespace gsc return scripting::script_value{}; }); - function::add("isusingmatchrulesdata", [](const function_args& args) - { - // return 0 so the game doesn't override the cfg - return 0; - }); - function::add("say", [](const function_args& args) { const auto message = args[0].as(); @@ -471,6 +474,9 @@ namespace gsc return scripting::script_value{}; }); + function::add("typeof", typeof); + function::add("type", typeof); + method::add("tell", [](const game::scr_entref_t ent, const function_args& args) { if (ent.classnum != 0) diff --git a/src/client/component/io.cpp b/src/client/component/io.cpp index b1ca0882..64373558 100644 --- a/src/client/component/io.cpp +++ b/src/client/component/io.cpp @@ -20,7 +20,7 @@ namespace io { namespace { - bool use_root_folder = false; + bool allow_root_io = false; void check_path(const std::filesystem::path& path) { @@ -34,7 +34,7 @@ namespace io { check_path(path); - if (use_root_folder) + if (allow_root_io) { static const auto fs_base_game = game::Dvar_FindVar("fs_basepath"); const std::filesystem::path fs_base_game_path(fs_base_game->current.string); @@ -69,10 +69,10 @@ namespace io public: void post_unpack() override { - use_root_folder = utils::flags::has_flag("io_game_dir"); - if (use_root_folder) + allow_root_io = utils::flags::has_flag("allow_root_io"); + if (allow_root_io) { - console::warn("GSC has access to your game folder. To prevent possible malicious code, remove the '-io_game_dir' launch flag."); + console::warn("GSC has access to your game folder. Remove the '-allow_root_io' launch parameter to disable this feature."); } gsc::function::add("fileexists", [](const gsc::function_args& args) diff --git a/src/client/component/json.cpp b/src/client/component/json.cpp index 3a879694..8ff70958 100644 --- a/src/client/component/json.cpp +++ b/src/client/component/json.cpp @@ -94,7 +94,7 @@ namespace json case (game::SCRIPT_FUNCTION): return _value.as().get_name(); default: - return "[unknown type]"; + return utils::string::va("[%s]", _value.type_name().data()); }; } diff --git a/src/client/game/scripting/script_value.hpp b/src/client/game/scripting/script_value.hpp index 3adbb9ef..ee703e09 100644 --- a/src/client/game/scripting/script_value.hpp +++ b/src/client/game/scripting/script_value.hpp @@ -30,20 +30,19 @@ namespace scripting {11, "builtin method"}, {12, "stack"}, {13, "animation"}, - {14, "developer codepos"}, // this exists on H1 but not IW6 (also not sure if past here may be correct) - {15, "pre animation"}, - {16, "thread"}, - {17, "notify thread"}, - {18, "time thread"}, - {19, "child thread"}, - {20, "struct"}, - {21, "removed entity"}, - {22, "entity"}, - {23, "array"}, - {24, "removed thread"}, - {25, ""}, // VAR_COUNT is 25 on H1, but 24 on IW6 - {26, "thread list"}, - {27, "endon list"}, + {14, "pre animation"}, + {15, "thread"}, + {16, "notify thread"}, + {17, "time thread"}, + {18, "child thread"}, + {19, "struct"}, + {20, "removed entity"}, + {21, "entity"}, + {22, "array"}, + {23, "removed thread"}, + {24, ""}, + {25, "thread list"}, + {26, "endon list"}, }; std::string get_typename(const game::VariableValue& value) diff --git a/src/client/game/structs.hpp b/src/client/game/structs.hpp index 155c7b5e..67bb8fe7 100644 --- a/src/client/game/structs.hpp +++ b/src/client/game/structs.hpp @@ -56,22 +56,21 @@ namespace game VAR_BUILTIN_METHOD = 0xB, VAR_STACK = 0xC, VAR_ANIMATION = 0xD, - VAR_DEVELOPER_CODEPOS = 0xE, - VAR_PRE_ANIMATION = 0xF, - VAR_THREAD = 0x10, - VAR_NOTIFY_THREAD = 0x11, - VAR_TIME_THREAD = 0x12, - VAR_CHILD_THREAD = 0x13, - VAR_OBJECT = 0x14, - VAR_DEAD_ENTITY = 0x15, - VAR_ENTITY = 0x16, - VAR_ARRAY = 0x17, - VAR_DEAD_THREAD = 0x18, - VAR_COUNT = 0x19, - VAR_FREE = 0x19, - VAR_THREAD_LIST = 0x1A, - VAR_ENDON_LIST = 0x1B, - VAR_TOTAL_COUNT = 0x1C, + VAR_PRE_ANIMATION = 0xE, + VAR_THREAD = 0xF, + VAR_NOTIFY_THREAD = 0x10, + VAR_TIME_THREAD = 0x11, + VAR_CHILD_THREAD = 0x12, + VAR_OBJECT = 0x13, + VAR_DEAD_ENTITY = 0x14, + VAR_ENTITY = 0x15, + VAR_ARRAY = 0x16, + VAR_DEAD_THREAD = 0x17, + VAR_COUNT = 0x18, + VAR_FREE = 0x18, + VAR_THREAD_LIST = 0x19, + VAR_ENDON_LIST = 0x1A, + VAR_TOTAL_COUNT = 0x1B, }; struct VariableStackBuffer