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

Merge pull request #366 from diamante0018/develop

Browse Source
This commit is contained in:
fed 2022-10-15 19:58:06 +00:00 committed by GitHub
commit ec98274ac8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/client/component/scripting.cpp
View File

@ -4,10 +4,8 @@
#include "game/game.hpp"
#include "game/dvars.hpp"
#include "command.hpp"
#include "scheduler.hpp"
#include "scripting.hpp"
#include "console.hpp"
#include "gsc.hpp"
#include "game/scripting/event.hpp"
@ -17,7 +15,6 @@
#include <utils/hook.hpp>
#include <utils/concurrency.hpp>
#include <utils/string.hpp>
namespace scripting
{

1
src/client/game/scripting/functions.cpp
View File

@ -5,7 +5,6 @@
#include <xsk/gsc/types.hpp>
#include <xsk/resolver.hpp>
#include <xsk/utils/compression.hpp>
#include <utils/string.hpp>

24
src/client/game/scripting/lua/context.cpp
View File

@ -3,22 +3,20 @@
#include "error.hpp"
#include "value_conversion.hpp"
#include "../execution.hpp"
#include "../functions.hpp"
#include "game/scripting/execution.hpp"
#include "../../../component/notifies.hpp"
#include "../../../component/scripting.hpp"
#include "../../../component/command.hpp"
#include "../../../component/fastfiles.hpp"
#include "../../../component/mods.hpp"
#include "../../../component/localized_strings.hpp"
#include "../../../component/scheduler.hpp"
#include "component/notifies.hpp"
#include "component/scripting.hpp"
#include "component/command.hpp"
#include "component/fastfiles.hpp"
#include "component/mods.hpp"
#include "component/localized_strings.hpp"
#include "component/scheduler.hpp"
#include "game/ui_scripting/execution.hpp"
#include <xsk/gsc/types.hpp>
#include <xsk/resolver.hpp>
#include <xsk/utils/compression.hpp>
#include <utils/string.hpp>
#include <utils/io.hpp>
@ -342,8 +340,7 @@ namespace scripting::lua
for (const auto& func : xsk::gsc::h2::resolver::get_methods())
{
const auto func_name = std::string(func.first);
const auto name = utils::string::to_lower(func_name);
const auto name = std::string(func.first);
entity_type[name.data()] = [name](const entity& entity, const sol::this_state s, sol::variadic_args va)
{
std::vector<script_value> arguments{};
@ -476,8 +473,7 @@ namespace scripting::lua
for (const auto& func : xsk::gsc::h2::resolver::get_functions())
{
const auto func_name = std::string(func.first);
const auto name = utils::string::to_lower(func_name);
const auto name = std::string(func.first);
game_type[name] = [name](const game&, const sol::this_state s, sol::variadic_args va)
{
std::vector<script_value> arguments{};