voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-06 11:31:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

add component ARGS variable

Browse source
This commit is contained in:
MihailRis 2024-07-01 00:17:58 +03:00
parent da6b014d62
commit 1b41a75cf4
6 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/logic/scripting/lua/libentity.cpp
View file

@ -31,7 +31,11 @@ static int l_spawn(lua::State* L) {
auto defname = lua::tostring(L, 1);
auto& def = content->entities.require(defname);
auto pos = lua::tovec3(L, 2);
level->entities->spawn(def, pos);
dynamic::Value args = dynamic::NONE;
if (lua::gettop(L) > 2) {
args = lua::tovalue(L, 3);
}
level->entities->spawn(def, pos, args);
return 1;
}

9
src/logic/scripting/scripting.cpp
View file

@ -256,7 +256,12 @@ bool scripting::on_item_break_block(Player* player, const ItemDef* item, int x,
});
}
scriptenv scripting::on_entity_spawn(const EntityDef& def, entityid_t eid, entity_funcs_set& funcsset) {
scriptenv scripting::on_entity_spawn(
const EntityDef& def,
entityid_t eid,
entity_funcs_set& funcsset,
dynamic::Value args
) {
auto L = lua::get_main_thread();
lua::requireglobal(L, STDCOMP);
if (lua::getfield(L, "new_Entity")) {
@ -266,6 +271,8 @@ scriptenv scripting::on_entity_spawn(const EntityDef& def, entityid_t eid, entit
auto entityenv = create_entity_environment(get_root_environment(), -1);
lua::get_from(L, lua::CHUNKS_TABLE, def.scriptName, true);
lua::pushenv(L, *entityenv);
lua::pushvalue(L, args);
lua::setfield(L, "ARGS");
lua::setfenv(L);
lua::call_nothrow(L, 0, 0);

7
src/logic/scripting/scripting.hpp
View file

@ -76,7 +76,12 @@ namespace scripting {
/// @return true if prevents default action
bool on_item_break_block(Player* player, const ItemDef* item, int x, int y, int z);
scriptenv on_entity_spawn(const EntityDef& def, entityid_t eid, entity_funcs_set&);
scriptenv on_entity_spawn(
const EntityDef& def,
entityid_t eid,
entity_funcs_set&,
dynamic::Value args
);
bool on_entity_despawn(const EntityDef& def, const Entity& entity);
bool on_entity_grounded(const Entity& entity, float force);
bool on_entity_fall(const Entity& entity);