Future/t5-gsc-utils
1
0
Fork 0
mirror of https://github.com/alicealys/t5-gsc-utils.git synced 2025-04-19 20:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small cleanup

Browse Source
This commit is contained in:
Federico Cecchetto 2022-06-10 03:38:15 +02:00
parent d7b31093c5
commit f05fdd33e9
3 changed files with 77 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/component/gsc.cpp
View File

@ -20,8 +20,8 @@ namespace gsc
utils::hook::detour get_function_hook; utils::hook::detour get_function_hook;
utils::hook::detour get_method_hook; utils::hook::detour get_method_hook;
std::unordered_map<std::string, std::function<scripting::script_value(const scripting::function_arguments& args)>> functions; std::unordered_map<std::string, function_t> functions;
std::unordered_map<std::string, std::function<scripting::script_value(const scripting::function_arguments& args)>> methods; std::unordered_map<std::string, function_t> methods;
std::unordered_map<std::string, void*> function_wraps; std::unordered_map<std::string, void*> function_wraps;
std::unordered_map<std::string, void*> method_wraps; std::unordered_map<std::string, void*> method_wraps;
@ -175,11 +175,9 @@ namespace gsc
namespace function namespace function
{ {
template <typename F> void add_internal(const std::string& name, const function_t& function)
void add(const std::string& name, F f)
{ {
const auto wrap = wrap_function(f); functions[name] = function;
functions[name] = wrap;
const auto call_wrap = wrap_function_call(name); const auto call_wrap = wrap_function_call(name);
function_wraps[name] = call_wrap; function_wraps[name] = call_wrap;
} }
@ -188,10 +186,9 @@ namespace gsc
namespace method namespace method
{ {
template <typename F> template <typename F>
void add(const std::string& name, F f) void add_internal(const std::string& name, const function_t& method)
{ {
const auto wrap = wrap_function(f); methods[name] = method;
methods[name] = wrap;
const auto call_wrap = wrap_method_call(name); const auto call_wrap = wrap_method_call(name);
method_wraps[name] = call_wrap; method_wraps[name] = call_wrap;
} }
@ -213,43 +210,6 @@ namespace gsc
// \n******* script runtime error *******\n%s\n // \n******* script runtime error *******\n%s\n
utils::hook::set<char>(0xAABA68 + 40, '\n'); utils::hook::set<char>(0xAABA68 + 40, '\n');
utils::hook::set<char>(0xAABA68 + 41, '\0'); utils::hook::set<char>(0xAABA68 + 41, '\0');
function::add("print_", [](const scripting::variadic_args& va)
{
for (const auto& arg : va)
{
printf("%s\t", arg.to_string().data());
}
printf("\n");
});
function::add("writefile", [](const std::string& file, const std::string& data,
const scripting::variadic_args& va)
{
auto append = false;
if (va.size() > 0)
{
append = va[0];
}
return utils::io::write_file(file, data, append);
});
function::add("appendfile", [](const std::string& file, const std::string& data)
{
return utils::io::write_file(file, data, true);
});
function::add("fileexists", utils::io::file_exists);
function::add("movefile", utils::io::move_file);
function::add("filesize", utils::io::file_size);
function::add("createdirectory", utils::io::create_directory);
function::add("directoryexists", utils::io::directory_exists);
function::add("directoryisempty", utils::io::directory_is_empty);
function::add("listfiles", utils::io::list_files);
function::add("removefile", utils::io::remove_file);
function::add("readfile", static_cast<std::string(*)(const std::string&)>(utils::io::read_file));
} }
}; };
} }

15
src/component/gsc.hpp
View File

@ -4,6 +4,7 @@
namespace gsc namespace gsc
{ {
using function_t = std::function<scripting::script_value(const scripting::function_arguments& args)>;
using script_function = void(*)(game::scr_entref_t); using script_function = void(*)(game::scr_entref_t);
template <class... Args, std::size_t... I> template <class... Args, std::size_t... I>
@ -48,13 +49,23 @@ namespace gsc
namespace function namespace function
{ {
void add_internal(const std::string& name, const function_t& function);
template <typename F> template <typename F>
void add(const std::string& name, F f); void add(const std::string& name, F f)
{
add_internal(name, wrap_function(f));
}
} }
namespace method namespace method
{ {
void add_internal(const std::string& name, const function_t& function);
template <typename F> template <typename F>
void add(const std::string& name, F f); void add(const std::string& name, F f)
{
add_internal(name, wrap_function(f));
}
} }
} }

58
src/component/io.cpp Normal file
View File

@ -0,0 +1,58 @@
#include <stdinc.hpp>
#include "loader/component_loader.hpp"
#include "game/structs.hpp"
#include "game/game.hpp"
#include "gsc.hpp"
#include <utils/io.hpp>
namespace io
{
class component final : public component_interface
{
public:
void post_unpack() override
{
gsc::function::add("print_", [](const scripting::variadic_args& va)
{
for (const auto& arg : va)
{
printf("%s\t", arg.to_string().data());
}
printf("\n");
});
gsc::function::add("writefile", [](const std::string& file, const std::string& data,
const scripting::variadic_args& va)
{
auto append = false;
if (va.size() > 0)
{
append = va[0];
}
return utils::io::write_file(file, data, append);
});
gsc::function::add("appendfile", [](const std::string& file, const std::string& data)
{
return utils::io::write_file(file, data, true);
});
gsc::function::add("fileexists", utils::io::file_exists);
gsc::function::add("movefile", utils::io::move_file);
gsc::function::add("filesize", utils::io::file_size);
gsc::function::add("createdirectory", utils::io::create_directory);
gsc::function::add("directoryexists", utils::io::directory_exists);
gsc::function::add("directoryisempty", utils::io::directory_is_empty);
gsc::function::add("listfiles", utils::io::list_files);
gsc::function::add("removefile", utils::io::remove_file);
gsc::function::add("readfile", static_cast<std::string(*)(const std::string&)>(utils::io::read_file));
}
};
}
REGISTER_COMPONENT(io::component)