]> git.lizzy.rs Git - minetest.git/blobdiff - src/environment.cpp
Merge pull request #13 from Bahamada/upstream_merge
[minetest.git] / src / environment.cpp
index f5f20d0e5e0b7832889e9c60f0013bb92058735c..e2c704259888323064063c0bf7a4a78b8e7aeab0 100644 (file)
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 #include "porting.h"
 #include "collision.h"
+#include "content_mapnode.h"
 
 
 Environment::Environment():
@@ -578,6 +579,66 @@ void spawnRandomObjects(MapBlock *block)
 }
 #endif
 
+void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime)
+{
+       // Get time difference
+       u32 dtime_s = 0;
+       u32 stamp = block->getTimestamp();
+       if(m_game_time > stamp && stamp != BLOCK_TIMESTAMP_UNDEFINED)
+               dtime_s = m_game_time - block->getTimestamp();
+       dtime_s += additional_dtime;
+
+       // Set current time as timestamp (and let it set ChangedFlag)
+       block->setTimestamp(m_game_time);
+
+       //dstream<<"Block is "<<dtime_s<<" seconds old."<<std::endl;
+
+       // 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->setChangedFlag();
+       }
+
+       // TODO: Do something
+       // TODO: Implement usage of ActiveBlockModifier
+
+       // Here's a quick demonstration
+       v3s16 p0;
+       for(p0.X=0; p0.X<MAP_BLOCKSIZE; p0.X++)
+       for(p0.Y=0; p0.Y<MAP_BLOCKSIZE; p0.Y++)
+       for(p0.Z=0; p0.Z<MAP_BLOCKSIZE; p0.Z++)
+       {
+               v3s16 p = p0 + block->getPosRelative();
+               MapNode n = block->getNodeNoEx(p0);
+#if 1
+               // Test something:
+               // Convert all mud under proper day lighting to grass
+               if(n.d == CONTENT_MUD)
+               {
+                       if(dtime_s > 300)
+                       {
+                               MapNode n_top = block->getNodeNoEx(p0+v3s16(0,1,0));
+                               if(content_features(n_top.d).air_equivalent &&
+                                               n_top.getLight(LIGHTBANK_DAY) >= 13)
+                               {
+                                       n.d = CONTENT_GRASS;
+                                       m_map->addNodeWithEvent(p, n);
+                               }
+                       }
+               }
+#endif
+       }
+}
+
 void ServerEnvironment::step(float dtime)
 {
        DSTACK(__FUNCTION_NAME);
@@ -693,8 +754,8 @@ void ServerEnvironment::step(float dtime)
                        MapBlock *block = m_map->getBlockNoCreateNoEx(p);
                        if(block==NULL)
                                continue;
-                       
-                       // Set current time as timestamp
+                       // Set current time as timestamp (and let it set ChangedFlag)
+
                        block->setTimestamp(m_game_time);
                }
 
@@ -714,18 +775,18 @@ void ServerEnvironment::step(float dtime)
                        MapBlock *block = m_map->getBlockNoCreateNoEx(p);
                        if(block==NULL)
                                continue;
-                       
+
                        // Get time difference
                        u32 dtime_s = 0;
                        u32 stamp = block->getTimestamp();
                        if(m_game_time > stamp && stamp != BLOCK_TIMESTAMP_UNDEFINED)
                                dtime_s = m_game_time - block->getTimestamp();
 
-                       // Set current time as timestamp
+                       // Set current time as timestamp (and let it set ChangedFlag)
                        block->setTimestamp(m_game_time);
 
                        //dstream<<"Block is "<<dtime_s<<" seconds old."<<std::endl;
-                       
+
                        // Activate stored objects
                        activateObjects(block);
 
@@ -737,11 +798,13 @@ void ServerEnvironment::step(float dtime)
                                event.type = MEET_BLOCK_NODE_METADATA_CHANGED;
                                event.p = p;
                                m_map->dispatchEvent(&event);
+
+                               block->setChangedFlag();
                        }
 
                        // TODO: Do something
                        // TODO: Implement usage of ActiveBlockModifier
-                       
+
                        // Here's a quick demonstration
                        v3s16 p0;
                        for(p0.X=0; p0.X<MAP_BLOCKSIZE; p0.X++)
@@ -765,6 +828,22 @@ void ServerEnvironment::step(float dtime)
                                                }
                                        }
                                }
+                               /*
+                                       Convert grass into mud if under something else than air
+                               */
+                               else if(n.d == CONTENT_GRASS)
+                               {
+                                       //if(myrand()%20 == 0)
+                                       {
+                                               MapNode n_top = block->getNodeNoEx(p0+v3s16(0,1,0));
+                                               if(n_top.d != CONTENT_AIR
+                                                               && n_top.d != CONTENT_IGNORE)
+                                               {
+                                                       n.d = CONTENT_MUD;
+                                                       m_map->addNodeWithEvent(p, n);
+                                               }
+                                       }
+                               }
                        }
                }
        }
@@ -790,7 +869,7 @@ void ServerEnvironment::step(float dtime)
                                continue;
                        
                        // Set current time as timestamp
-                       block->setTimestamp(m_game_time);
+                       block->setTimestampNoChangedFlag(m_game_time);
 
                        // Run node metadata
                        bool changed = block->m_node_metadata.step(dtime);
@@ -800,6 +879,8 @@ void ServerEnvironment::step(float dtime)
                                event.type = MEET_BLOCK_NODE_METADATA_CHANGED;
                                event.p = p;
                                m_map->dispatchEvent(&event);
+
+                               block->setChangedFlag();
                        }
                }
        }
@@ -821,7 +902,7 @@ void ServerEnvironment::step(float dtime)
                                continue;
                        
                        // Set current time as timestamp
-                       block->setTimestamp(m_game_time);
+                       block->setTimestampNoChangedFlag(m_game_time);
 
                        /*
                                Do stuff!
@@ -862,6 +943,22 @@ void ServerEnvironment::step(float dtime)
                                                }
                                        }
                                }
+                               /*
+                                       Convert grass into mud if under something else than air
+                               */
+                               else if(n.d == CONTENT_GRASS)
+                               {
+                                       //if(myrand()%20 == 0)
+                                       {
+                                               MapNode n_top = block->getNodeNoEx(p0+v3s16(0,1,0));
+                                               if(n_top.d != CONTENT_AIR
+                                                               && n_top.d != CONTENT_IGNORE)
+                                               {
+                                                       n.d = CONTENT_MUD;
+                                                       m_map->addNodeWithEvent(p, n);
+                                               }
+                                               }
+                                       }
                        }
                }
        }
@@ -996,49 +1093,8 @@ u16 getFreeServerActiveObjectId(
 u16 ServerEnvironment::addActiveObject(ServerActiveObject *object)
 {
        assert(object);
-       if(object->getId() == 0)
-       {
-               u16 new_id = getFreeServerActiveObjectId(m_active_objects);
-               if(new_id == 0)
-               {
-                       dstream<<"WARNING: ServerEnvironment::addActiveObject(): "
-                                       <<"no free ids available"<<std::endl;
-                       delete object;
-                       return 0;
-               }
-               object->setId(new_id);
-       }
-       if(isFreeServerActiveObjectId(object->getId(), m_active_objects) == false)
-       {
-               dstream<<"WARNING: ServerEnvironment::addActiveObject(): "
-                               <<"id is not free ("<<object->getId()<<")"<<std::endl;
-               delete object;
-               return 0;
-       }
-       /*dstream<<"INGO: ServerEnvironment::addActiveObject(): "
-                       <<"added (id="<<object->getId()<<")"<<std::endl;*/
-                       
-       m_active_objects.insert(object->getId(), object);
-
-       // Add static object to active static list of the block
-       v3f objectpos = object->getBasePosition();
-       std::string staticdata = object->getStaticData();
-       StaticObject s_obj(object->getType(), objectpos, staticdata);
-       // Add to the block where the object is located in
-       v3s16 blockpos = getNodeBlockPos(floatToInt(objectpos, BS));
-       MapBlock *block = m_map->getBlockNoCreateNoEx(blockpos);
-       if(block)
-       {
-               block->m_static_objects.m_active.insert(object->getId(), s_obj);
-               object->m_static_exists = true;
-               object->m_static_block = blockpos;
-       }
-       else{
-               dstream<<"WARNING: Server: Could not find a block for "
-                               <<"storing newly added static active object"<<std::endl;
-       }
-
-       return object->getId();
+       u16 id = addActiveObjectRaw(object, true);
+       return id;
 }
 
 /*
@@ -1141,6 +1197,58 @@ ActiveObjectMessage ServerEnvironment::getActiveObjectMessage()
        ************ Private methods *************
 */
 
+u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object,
+               bool set_changed)
+{
+       assert(object);
+       if(object->getId() == 0)
+       {
+               u16 new_id = getFreeServerActiveObjectId(m_active_objects);
+               if(new_id == 0)
+               {
+                       dstream<<"WARNING: ServerEnvironment::addActiveObjectRaw(): "
+                                       <<"no free ids available"<<std::endl;
+                       delete object;
+                       return 0;
+               }
+               object->setId(new_id);
+       }
+       if(isFreeServerActiveObjectId(object->getId(), m_active_objects) == false)
+       {
+               dstream<<"WARNING: ServerEnvironment::addActiveObjectRaw(): "
+                               <<"id is not free ("<<object->getId()<<")"<<std::endl;
+               delete object;
+               return 0;
+       }
+       /*dstream<<"INGO: ServerEnvironment::addActiveObjectRaw(): "
+                       <<"added (id="<<object->getId()<<")"<<std::endl;*/
+                       
+       m_active_objects.insert(object->getId(), object);
+
+       // Add static object to active static list of the block
+       v3f objectpos = object->getBasePosition();
+       std::string staticdata = object->getStaticData();
+       StaticObject s_obj(object->getType(), objectpos, staticdata);
+       // Add to the block where the object is located in
+       v3s16 blockpos = getNodeBlockPos(floatToInt(objectpos, BS));
+       MapBlock *block = m_map->getBlockNoCreateNoEx(blockpos);
+       if(block)
+       {
+               block->m_static_objects.m_active.insert(object->getId(), s_obj);
+               object->m_static_exists = true;
+               object->m_static_block = blockpos;
+
+               if(set_changed)
+                       block->setChangedFlag();
+       }
+       else{
+               dstream<<"WARNING: Server: Could not find a block for "
+                               <<"storing newly added static active object"<<std::endl;
+       }
+
+       return object->getId();
+}
+
 /*
        Remove objects that satisfy (m_removed && m_known_by_count==0)
 */
@@ -1231,8 +1339,8 @@ void ServerEnvironment::activateObjects(MapBlock *block)
                        continue;
                }
                // This will also add the object to the active static list
-               addActiveObject(obj);
-               //u16 id = addActiveObject(obj);
+               addActiveObjectRaw(obj, false);
+               //u16 id = addActiveObjectRaw(obj, false);
        }
        // Clear stored list
        block->m_static_objects.m_stored.clear();
@@ -1245,7 +1353,8 @@ void ServerEnvironment::activateObjects(MapBlock *block)
                block->m_static_objects.m_stored.push_back(s_obj);
        }
        // Block has been modified
-       block->setChangedFlag();
+       // NOTE: No it has not really. Save I/O here.
+       //block->setChangedFlag();
 }
 
 /*