XLabsProject-Mirror/s1x-client
1
0
Fork 0
mirror of https://github.com/XLabsProject/s1x-client.git synced 2023-08-02 15:02:12 +02:00
Code Issues Releases Activity

Merge pull request #34 from fedddddd/scripting

Browse Source 
More custom fields support
This commit is contained in:
quaK 2021-03-13 16:07:29 +02:00 committed by GitHub
commit 9edebe817c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@
#include "game/scripting/entity.hpp"
#include "game/scripting/event.hpp"
#include "game/scripting/lua/engine.hpp"
#include "game/scripting/execution.hpp"
#include "scheduler.hpp"
@ -35,6 +36,11 @@ namespace scripting
e.arguments.emplace_back(*value);
}
if (e.name == "connected")
{
scripting::clear_entity_fields(e.entity);
}
lua::engine::notify(e);
}
}

20
src/client/game/scripting/execution.cpp
View File

@ -125,7 +125,25 @@ namespace scripting
void set_custom_field(const entity& entity, const std::string& field, const script_value& value)
{
custom_fields[entity.get_entity_id()].insert(std::make_pair(field, value));
const auto id = entity.get_entity_id();
if (custom_fields[id].find(field) != custom_fields[id].end())
{
custom_fields[id][field] = value;
return;
}
custom_fields[id].insert(std::make_pair(field, value));
}
void clear_entity_fields(const entity& entity)
{
const auto id = entity.get_entity_id();
if (custom_fields.find(id) != custom_fields.end())
{
custom_fields[id].clear();
}
}
void clear_custom_fields()

1
src/client/game/scripting/execution.hpp
View File

@ -21,6 +21,7 @@ namespace scripting
return call<script_value>(name, arguments).as<T>();
}
void clear_entity_fields(const entity& entity);
void clear_custom_fields();
void set_entity_field(const entity& entity, const std::string& field, const script_value& value);

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

@ -185,6 +185,17 @@ namespace scripting::lua
return convert(s, entity.call(function, arguments));
};
entity_type[sol::meta_function::new_index] = [](const entity& entity, const std::string& field,
const sol::lua_value& value)
{
entity.set(field, convert(value));
};
entity_type[sol::meta_function::index] = [](const entity& entity, const sol::this_state s, const std::string& field)
{
return convert(s, entity.get(field));
};
struct game
{
};