luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 16:45:20 +02:00
Code Activity

Give more infos to on_timer() callback

Browse Source 
closes #15817
This commit is contained in:
sfan5
2025-08-10 17:22:06 +02:00
parent 7c88996210
commit fd3588d49c
8 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mapblock.cpp
View File

@@ -168,7 +168,7 @@ bool MapBlock::saveStaticObject(u16 id, const StaticObject &obj, u32 reason)
return true;
}
void MapBlock::step(float dtime, const std::function<bool(v3s16, MapNode, f32)> &on_timer_cb)
void MapBlock::step(float dtime, const std::function<bool(v3s16, MapNode, NodeTimer)> &on_timer_cb)
{
// Run callbacks for elapsed node_timers
std::vector<NodeTimer> elapsed_timers = m_node_timers.step(dtime);
@@ -177,8 +177,10 @@ void MapBlock::step(float dtime, const std::function<bool(v3s16, MapNode, f32)>
for (const auto &it : elapsed_timers) {
n = getNodeNoEx(it.position);
p = it.position + getPosRelative();
if (on_timer_cb(p, n, it.elapsed))
if (on_timer_cb(p, n, it)) {
// restart
setNodeTimer(NodeTimer(it.timeout, 0, it.position));
}
if (isOrphan())
return;
}