diff options
| author | Kahrl <kahrl@gmx.net> | 2012-03-19 01:08:04 +0100 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-06-03 22:31:00 +0300 |
| commit | 704782c95b8a4194a9383da55d93f37fd0f7278f (patch) | |
| tree | 6f69d40659b463b54670b487ee4a0d0c2c63891b /src/environment.cpp | |
| parent | 67059e193229137e88f5e10e08c9c7e18c408281 (diff) | |
| download | minetest-704782c95b8a4194a9383da55d93f37fd0f7278f.tar.gz minetest-704782c95b8a4194a9383da55d93f37fd0f7278f.tar.bz2 minetest-704782c95b8a4194a9383da55d93f37fd0f7278f.zip | |
WIP node metadata, node timers
Diffstat (limited to 'src/environment.cpp')
| -rw-r--r-- | src/environment.cpp | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/src/environment.cpp b/src/environment.cpp index f0ba097e0..6c7b23686 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -773,18 +773,11 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime) // Activate stored objects activateObjects(block); - // Run node metadata - bool changed = block->m_node_metadata->step((float)dtime_s); - if(changed) - { - MapEditEvent event; - event.type = MEET_BLOCK_NODE_METADATA_CHANGED; - event.p = block->getPos(); - m_map->dispatchEvent(&event); - - block->raiseModified(MOD_STATE_WRITE_NEEDED, - "node metadata modified in activateBlock"); - } + // Run node timers + std::map<v3s16, f32> elapsed_timers = + block->m_node_timers.step((float)dtime_s); + if(!elapsed_timers.empty()) + errorstream<<"Node timers don't work yet!"<<std::endl; /* Handle ActiveBlockModifiers */ ABMHandler abmhandler(m_abms, dtime_s, this, false); @@ -1064,18 +1057,11 @@ void ServerEnvironment::step(float dtime) block->raiseModified(MOD_STATE_WRITE_AT_UNLOAD, "Timestamp older than 60s (step)"); - // Run node metadata - bool changed = block->m_node_metadata->step(dtime); - if(changed) - { - MapEditEvent event; - event.type = MEET_BLOCK_NODE_METADATA_CHANGED; - event.p = p; - m_map->dispatchEvent(&event); - - block->raiseModified(MOD_STATE_WRITE_NEEDED, - "node metadata modified in step"); - } + // Run node timers + std::map<v3s16, f32> elapsed_timers = + block->m_node_timers.step(dtime); + if(!elapsed_timers.empty()) + errorstream<<"Node timers don't work yet!"<<std::endl; } } |