Rim/iw5-mod
Rim/iw5-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

update

Browse Source
This commit is contained in:
FutureRave 2023-02-12 13:27:35 +00:00
parent 3ee2d1ec42
commit c9e8f44ee3
No known key found for this signature in database
GPG Key ID: 22F9079C86CFAB31
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/gsc-tool vendored

@ -1 +1 @@
Subproject commit b3ac7d2562e41a0cf821e39baa96b80c02b6ba9c Subproject commit bd05f90a34c33dfcec2addb902984a0f392f5ecc

4
src/module/gsc/script_error.cpp
View File

@ -124,8 +124,8 @@ namespace gsc
{ {
try try
{ {
auto index = gsc::cxt->opcode_enum(opcode); const auto index = gsc::cxt->opcode_enum(opcode);
return {xsk::gsc::opcode_name(index)}; return {gsc::cxt->opcode_name(index)};
} }
catch (...) catch (...)
{ {

24
src/module/gsc/script_loading.cpp
View File

@ -21,7 +21,6 @@ namespace gsc
namespace namespace
{ {
utils::memory::allocator script_file_allocator; utils::memory::allocator script_file_allocator;
std::unordered_map<std::string, std::string> included_scripts;
std::unordered_map<std::string, game::native::ScriptFile*> loaded_scripts; std::unordered_map<std::string, game::native::ScriptFile*> loaded_scripts;
@ -33,10 +32,9 @@ namespace gsc
void clear() void clear()
{ {
script_file_allocator.clear(); script_file_allocator.clear();
included_scripts.clear();
loaded_scripts.clear();
main_handles.clear(); main_handles.clear();
init_handles.clear(); init_handles.clear();
loaded_scripts.clear();
} }
bool read_raw_script_file(const std::string& name, std::string* data) bool read_raw_script_file(const std::string& name, std::string* data)
@ -55,7 +53,7 @@ namespace gsc
return false; return false;
} }
std::pair<xsk::gsc::buffer, xsk::gsc::buffer> read_compiled_script_file(const std::string& name, const std::string& real_name) std::pair<xsk::gsc::buffer, std::vector<std::uint8_t>> read_compiled_script_file(const std::string& name, const std::string& real_name)
{ {
const auto* script_file = game::native::DB_FindXAssetHeader(game::native::ASSET_TYPE_SCRIPTFILE, name.data(), false).scriptfile; const auto* script_file = game::native::DB_FindXAssetHeader(game::native::ASSET_TYPE_SCRIPTFILE, name.data(), false).scriptfile;
if (!script_file) if (!script_file)
@ -65,18 +63,13 @@ namespace gsc
console::info("Decompiling scriptfile '%s'\n", real_name.data()); console::info("Decompiling scriptfile '%s'\n", real_name.data());
if (const auto itr = included_scripts.find(name); itr != included_scripts.end())
{
return {{script_file->bytecode, static_cast<std::uint32_t>(script_file->bytecodeLen)}, {reinterpret_cast<std::uint8_t*>(itr->second.data()), itr->second.size()}};
}
const std::string stack{script_file->buffer, static_cast<std::uint32_t>(script_file->len)}; const std::string stack{script_file->buffer, static_cast<std::uint32_t>(script_file->len)};
const auto decompressed_stack = utils::compression::zlib::decompress(stack); const auto decompressed_stack = utils::compression::zlib::decompress(stack);
const auto result = included_scripts.emplace(std::make_pair(name, decompressed_stack)); std::vector<std::uint8_t> stack_data;
const auto& itr = result.first; stack_data.assign(decompressed_stack.begin(), decompressed_stack.end());
return {{script_file->bytecode, static_cast<std::uint32_t>(script_file->bytecodeLen)}, {reinterpret_cast<std::uint8_t*>(itr->second.data()), itr->second.size()}}; return {{script_file->bytecode, static_cast<std::uint32_t>(script_file->bytecodeLen)} , stack_data};
} }
game::native::ScriptFile* load_custom_script(const char* file_name, const std::string& real_name) game::native::ScriptFile* load_custom_script(const char* file_name, const std::string& real_name)
@ -233,7 +226,7 @@ namespace gsc
xsk::gsc::build::dev : xsk::gsc::build::dev :
xsk::gsc::build::prod; xsk::gsc::build::prod;
gsc::cxt->init(comp_mode, [](const std::string& include_name) -> std::pair<xsk::gsc::buffer, xsk::gsc::buffer> gsc::cxt->init(comp_mode, [](const std::string& include_name) -> std::pair<xsk::gsc::buffer, std::vector<std::uint8_t>>
{ {
const auto real_name = get_raw_script_file_name(include_name); const auto real_name = get_raw_script_file_name(include_name);
@ -249,7 +242,10 @@ namespace gsc
throw std::runtime_error(std::format("Could not load gsc file '{}'", real_name)); throw std::runtime_error(std::format("Could not load gsc file '{}'", real_name));
} }
return {xsk::gsc::buffer(reinterpret_cast<std::uint8_t*>(file_buffer.data()), file_buffer.size()), {}}; std::vector<std::uint8_t> script_data;
script_data.assign(file_buffer.begin(), file_buffer.end());
return {{}, script_data};
}); });
utils::hook::invoke<void>(SELECT_VALUE(0x4B4EE0, 0x561E80)); utils::hook::invoke<void>(SELECT_VALUE(0x4B4EE0, 0x561E80));