minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Update read_engine_mask logic.

This commit is contained in:
SFENCE 2024-05-09 08:03:55 +02:00
parent b3b89bc424
commit 4a2cd384b2
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/lua_api.md
View File

@ -8848,10 +8848,16 @@ Player properties need to be saved manually.
-- This can be used to enable/disable some parts of the engine.
drowning = true,
-- Drowning (only available for players)
-- true/false - new value to be set
-- nil - no change of value
breathing = true,
-- Breathing (only available for players)
-- true/false - new value to be set
-- nil - no change of value
node_hurt = true,
-- Node damage (only available for players)
-- true/false - new value to be set
-- nil - no change of value
},
}
```

13
src/script/common/c_content.cpp
View File

@ -582,15 +582,14 @@ void push_object_properties(lua_State *L, const ObjectProperties *prop)
static void read_engine_mask(lua_State *L, int index, u16 &engine_mask)
{
if (lua_istable(L, index)) {
bool check;
u16 old_mask = engine_mask;
#define UPDATE_MASK(field, mask) engine_mask |= \
getboolfield_default(L, -1, field, old_mask & mask) ? mask : 0;
engine_mask = 0;
getboolfield(L, -1, "drowning", check);
engine_mask |= check ? SAO_ENGINE_DROWNING : 0;
getboolfield(L, -1, "breathing", check);
engine_mask |= check ? SAO_ENGINE_BREATHING : 0;
getboolfield(L, -1, "node_hurt", check);
engine_mask |= check ? SAO_ENGINE_NODE_HURT : 0;
UPDATE_MASK("drowning", SAO_ENGINE_DROWNING)
UPDATE_MASK("breathing", SAO_ENGINE_BREATHING)
UPDATE_MASK("node_hurt", SAO_ENGINE_NODE_HURT)
}
}