Future/iw5-gsc-utils
1
0
Fork 0
mirror of https://github.com/fedddddd/iw5-gsc-utils.git synced 2025-04-20 21:05:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for pluto update

Browse Source
This commit is contained in:
fed 2023-02-27 01:18:50 +01:00
parent 1d94fdd88d
commit 24b3a9369e
6 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/component/gsc.cpp
View File

@ -27,7 +27,7 @@ namespace gsc
{
if (function.second == id)
{
return function.first;
return function.first.data();
}
}
@ -42,7 +42,7 @@ namespace gsc
{
if (function.second == id)
{
return function.first;
return function.first.data();
}
}
@ -251,7 +251,8 @@ namespace gsc
const auto index = function_map_start++;
functions[index] = func;
(*game::plutonium::function_map_rev)[name] = index;
const auto name_view = utils::memory::get_allocator()->duplicate_string(name);
(*game::plutonium::function_map_rev)[name_view] = index;
}
}
@ -262,7 +263,8 @@ namespace gsc
const auto index = method_map_start++;
methods[index] = func;
(*game::plutonium::method_map_rev)[name] = index;
const auto name_view = utils::memory::get_allocator()->duplicate_string(name);
(*game::plutonium::method_map_rev)[name_view] = index;
}
}

27
src/component/signatures.cpp
View File

@ -52,23 +52,35 @@ namespace signatures
{
char bytes[4] = {0};
const auto string_ptr = find_string_ptr(string);
memcpy(bytes, &string_ptr, sizeof(bytes));
if (!string_ptr)
{
return 0;
}
std::memcpy(bytes, &string_ptr, sizeof(bytes));
return find_string_ptr({bytes, 4});
}
bool process_maps()
{
const auto string_ref = find_string_ref("Couldn't resolve builtin function id for name '%s'!");
const auto string_ref = find_string_ref("couldn't resolve builtin function id for name '%s'!");
if (!string_ref)
{
return false;
}
const auto map_ptr = *reinterpret_cast<size_t*>(string_ref - 0x3A);
const auto map_ptr = *reinterpret_cast<size_t*>(string_ref - 0x2B);
game::plutonium::function_map_rev.set(map_ptr);
printf("%p\n", map_ptr);
auto& map = *game::plutonium::function_map_rev;
for (const auto& [k, v] : map)
{
printf("%s %i\n", k.data(), v);
}
game::plutonium::method_map_rev.set(map_ptr + 0x20);
game::plutonium::file_map_rev.set(map_ptr + 0x40);
game::plutonium::token_map_rev.set(map_ptr + 0x60);
game::plutonium::token_map_rev.set(map_ptr + 0xBC);
return true;
}
@ -82,12 +94,15 @@ namespace signatures
const auto offset = *reinterpret_cast<size_t*>(string_ref + 5);
game::plutonium::printf.set(string_ref + 4 + 5 + offset);
utils::hook::jump(reinterpret_cast<uintptr_t>(&printf), game::plutonium::printf);
return true;
}
bool process()
{
load_function_tables();
return process_printf() && process_maps();
process_printf();
return process_maps();
}
}

25
src/game/scripting/functions.cpp
View File

@ -8,12 +8,12 @@ namespace scripting
namespace
{
std::unordered_map<std::string, uint16_t> lowercase_map(
const std::unordered_map<std::string, uint16_t>& old_map)
const std::unordered_map<std::string_view, uint16_t>& old_map)
{
std::unordered_map<std::string, uint16_t> new_map{};
for (auto& entry : old_map)
{
new_map[utils::string::to_lower(entry.first)] = entry.second;
new_map[utils::string::to_lower(entry.first.data())] = entry.second;
}
return new_map;
@ -71,20 +71,6 @@ namespace scripting
}
}
std::string find_file(unsigned int id)
{
const auto& file_map = *game::plutonium::file_map_rev;
for (const auto& file : file_map)
{
if (file.second == id)
{
return file.first;
}
}
return {};
}
std::string find_token(unsigned int id)
{
const auto& token_map = *game::plutonium::token_map_rev;
@ -92,13 +78,18 @@ namespace scripting
{
if (token.second == id)
{
return token.first;
return token.first.data();
}
}
return {};
}
std::string find_file(unsigned int id)
{
return find_token(id);
}
int find_token_id(const std::string& name)
{
const auto& token_map = *game::plutonium::token_map_rev;

6
src/game/symbols.hpp
View File

@ -86,10 +86,10 @@ namespace game
namespace plutonium
{
WEAK symbol<std::unordered_map<std::string, std::uint16_t>> function_map_rev{0};
WEAK symbol<std::unordered_map<std::string, std::uint16_t>> method_map_rev{0};
WEAK symbol<std::unordered_map<std::string, std::uint16_t>> file_map_rev{0};
WEAK symbol<std::unordered_map<std::string_view, std::uint16_t>> function_map_rev{0};
WEAK symbol<std::unordered_map<std::string_view, std::uint16_t>> method_map_rev{0};
WEAK symbol<std::unordered_map<std::string, std::uint16_t>> token_map_rev{0};
WEAK symbol<std::unordered_map<std::uint16_t, std::string_view>> token_map{0};
WEAK symbol<int(const char* fmt, ...)> printf{0};
WEAK symbol<void*> function_table{0};
WEAK symbol<void*> method_table{0};

6
src/utils/io.cpp
View File

@ -1,8 +1,14 @@
#include <stdinc.hpp>
#include <fstream>
#include "io.hpp"
namespace utils::io
{
bool remove_file(const std::string& file)
{
return DeleteFileA(file.data()) == TRUE;
}
bool file_exists(const std::string& file)
{
return std::ifstream(file).good();

1
src/utils/io.hpp
View File

@ -6,6 +6,7 @@
namespace utils::io
{
bool remove_file(const std::string& file);
bool file_exists(const std::string& file);
bool write_file(const std::string& file, const std::string& data, bool append = false);
bool read_file(const std::string& file, std::string* data);