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

commit 3

Browse Source
This commit is contained in:
Federico Cecchetto 2022-01-29 21:27:54 +01:00
parent 5fae85dd35
commit cef4cbc5b9
4 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/component/images.cpp
View File

@ -29,11 +29,7 @@ namespace images
}
});
if (data.empty()
&& !utils::io::read_file(utils::string::va("images/%s.png", image->name), &data)
&& game::mod_folder.empty() && !utils::io::read_file(utils::string::va("%s/images/%s.png",
game::mod_folder.data(), image->name), &data)
)
if (data.empty() && !utils::io::read_file(utils::string::va("images/%s.png", image->name), &data))
{
return {};
}

59
src/client/game/ui_scripting/lua/context.cpp
View File

@ -18,6 +18,7 @@
#include <utils/nt.hpp>
#include <utils/io.hpp>
#include <utils/http.hpp>
#include <utils/cryptography.hpp>
namespace ui_scripting::lua
{
@ -710,7 +711,7 @@ namespace ui_scripting::lua
);
}
void setup_game_type(sol::state& state, event_handler& handler, scheduler& scheduler, bool safe_mode)
void setup_game_type(sol::state& state, event_handler& handler, scheduler& scheduler)
{
struct game
{
@ -1103,35 +1104,37 @@ namespace ui_scripting::lua
return ::game::mod_folder;
};
if (/*!safe_mode*/true)
static int request_id{};
game_type["httpget"] = [](const game&, const std::string& url)
{
static int request_id{};
game_type["httpget"] = [](const game&, const std::string& url)
const auto id = request_id++;
::scheduler::once([url, id]()
{
const auto id = request_id++;
::scheduler::once([url, id]()
const auto result = utils::http::get_data(url);
::scheduler::once([result, id]
{
const auto result = utils::http::get_data(url);
::scheduler::once([result, id]
event event;
event.element = &ui_element;
event.name = "http_request_done";
if (result.has_value())
{
event event;
event.element = &ui_element;
event.name = "http_request_done";
if (result.has_value())
{
event.arguments = {id, true, result.value()};
}
else
{
event.arguments = {id, false};
}
event.arguments = { id, true, result.value() };
}
else
{
event.arguments = { id, false };
}
notify(event);
}, ::scheduler::pipeline::renderer);
}, ::scheduler::pipeline::async);
return id;
};
}
notify(event);
}, ::scheduler::pipeline::renderer);
}, ::scheduler::pipeline::async);
return id;
};
game_type["sha"] = [](const game&, const std::string& data)
{
return utils::cryptography::sha1::compute(data, true);
};
struct player
{
@ -1288,10 +1291,9 @@ namespace ui_scripting::lua
}
}
context::context(std::string data, script_type type, bool safe_mode)
context::context(std::string data, script_type type)
: scheduler_(state_)
, event_handler_(state_)
, safe_mode_(safe_mode)
{
this->state_.open_libraries(sol::lib::base,
@ -1307,8 +1309,7 @@ namespace ui_scripting::lua
setup_vector_type(this->state_);
setup_element_type(this->state_, this->event_handler_, this->scheduler_);
setup_menu_type(this->state_, this->event_handler_, this->scheduler_);
setup_game_type(this->state_, this->event_handler_,
this->scheduler_, this->safe_mode_);
setup_game_type(this->state_, this->event_handler_, this->scheduler_);
setup_lui_types(this->state_, this->event_handler_, this->scheduler_);
if (type == script_type::file)

3
src/client/game/ui_scripting/lua/context.hpp
View File

@ -29,7 +29,7 @@ namespace ui_scripting::lua
class context
{
public:
context(std::string data, script_type type, bool safe_mode);
context(std::string data, script_type type);
~context();
context(context&&) noexcept = delete;
@ -45,7 +45,6 @@ namespace ui_scripting::lua
sol::state state_{};
std::string folder_;
std::unordered_set<std::string> loaded_scripts_;
bool safe_mode_;
scheduler scheduler_;
event_handler event_handler_;

6
src/client/game/ui_scripting/lua/engine.cpp
View File

@ -318,14 +318,14 @@ namespace ui_scripting::lua::engine
{
if (std::filesystem::is_directory(script) && utils::io::file_exists(script + "/__init__.lua"))
{
get_scripts().push_back(std::make_unique<context>(script, script_type::file, true));
get_scripts().push_back(std::make_unique<context>(script, script_type::file));
}
}
}
void load_code(const std::string& code, bool safe_mode)
void load_code(const std::string& code)
{
get_scripts().push_back(std::make_unique<context>(code, script_type::code, safe_mode));
get_scripts().push_back(std::make_unique<context>(code, script_type::code));
}
void render_menus()