Use signature utils

This commit is contained in:
Federico Cecchetto
2022-03-26 19:51:51 +01:00
parent 7b995b3348
commit 4ffdb331b4
15 changed files with 246 additions and 7516 deletions

View File

@ -16,6 +16,11 @@ namespace game
return dedi_;
}
void set(const size_t dedi)
{
this->dedi_ = reinterpret_cast<T*>(dedi);
}
operator T* () const
{
return this->get();

View File

@ -263,11 +263,9 @@ namespace scripting
}
}
void array::set(const std::string& key, const script_value& _value) const
void array::set(const std::string& key, const script_value& value_) const
{
const auto value = _value.get_raw();
const auto string_value = game::SL_GetString(key.data(), 0);
const auto value = value_.get_raw();
const auto variable_id = this->get_value_id(key);
if (!variable_id)
@ -284,9 +282,9 @@ namespace scripting
variable->u.u = value.u;
}
void array::set(const unsigned int index, const script_value& _value) const
void array::set(const unsigned int index, const script_value& value_) const
{
const auto value = _value.get_raw();
const auto value = value_.get_raw();
const auto variable_id = this->get_value_id(index);
if (!variable_id)

File diff suppressed because it is too large Load Diff

View File

@ -7,10 +7,10 @@ namespace scripting
{
namespace
{
std::unordered_map<std::string, unsigned> lowercase_map(
const std::unordered_map<std::string, unsigned>& old_map)
std::unordered_map<std::string, uint16_t> lowercase_map(
const std::unordered_map<std::string, uint16_t>& old_map)
{
std::unordered_map<std::string, unsigned> new_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;
@ -19,15 +19,15 @@ namespace scripting
return new_map;
}
const std::unordered_map<std::string, unsigned>& get_methods()
const std::unordered_map<std::string, uint16_t>& get_methods()
{
static auto methods = lowercase_map(method_map);
static auto methods = lowercase_map(*game::plutonium::method_map_rev);
return methods;
}
const std::unordered_map<std::string, unsigned>& get_functions()
const std::unordered_map<std::string, uint16_t>& get_functions()
{
static auto function = lowercase_map(function_map);
static auto function = lowercase_map(*game::plutonium::function_map_rev);
return function;
}
@ -71,8 +71,23 @@ 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;
for (const auto& token : token_map)
{
if (token.second == id)
@ -86,6 +101,7 @@ namespace scripting
int find_token_id(const std::string& name)
{
const auto& token_map = *game::plutonium::token_map_rev;
const auto result = token_map.find(name);
if (result != token_map.end())

View File

@ -3,14 +3,10 @@
namespace scripting
{
extern std::unordered_map<std::string, unsigned> method_map;
extern std::unordered_map<std::string, unsigned> function_map;
extern std::unordered_map<std::string, unsigned> token_map;
extern std::unordered_map<unsigned, std::string> file_list;
using script_function = void(*)(game::scr_entref_t);
script_function find_function(const std::string& name, const bool prefer_global);
int find_token_id(const std::string& name);
std::string find_token(unsigned int id);
std::string find_file(unsigned int id);
}

View File

@ -86,11 +86,12 @@ namespace game
namespace plutonium
{
WEAK symbol<std::unordered_map<std::string, std::uint16_t>> function_map_rev{0x20802D34};
WEAK symbol<std::unordered_map<std::string, std::uint16_t>> method_map_rev{0x20802D54};
WEAK symbol<std::unordered_map<std::string, std::uint16_t>> token_map_rev{0x20802D94};
WEAK symbol<int(const char* fmt, ...)> printf{0x209F30F0};
WEAK symbol<void*> function_table{0x20762008};
WEAK symbol<void*> method_table{0x207627D8};
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, std::uint16_t>> token_map_rev{0};
WEAK symbol<int(const char* fmt, ...)> printf{0};
WEAK symbol<void*> function_table{0};
WEAK symbol<void*> method_table{0};
}
}
}