GenericNodeMetadata and an example furnace

[oweals/minetest.git] / src / map.cpp

diff --git a/src/map.cpp b/src/map.cpp
index fd0f1e313f51ab4637a952713f42e9db9e2fd75c..34bc31ba4098300c5a3b1cbde388ae1f6450ad96 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -860,15 +860,15 @@ void Map::updateLighting(enum LightBank bank,
                        for(s16 y=-1; y<=1; y++)
                        for(s16 x=-1; x<=1; x++)
                        {
-                               v3s16 p(x,y,z);
-                               MapBlock *block = getBlockNoCreateNoEx(p);
+                               v3s16 p2 = p + v3s16(x,y,z);
+                               MapBlock *block = getBlockNoCreateNoEx(p2);
                                if(block == NULL)
                                        continue;
                                if(block->isDummy())
                                        continue;
                                if(block->getLightingExpired())
                                        continue;
-                               vmanip.initialEmerge(p, p);
+                               vmanip.initialEmerge(p2, p2);
                        }*/
 
                        // Lighting of block will be updated completely
@@ -1007,8 +1007,13 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
        std::string metadata_name = nodemgr->get(n).metadata_name;
        if(metadata_name != ""){
                NodeMetadata *meta = NodeMetadata::create(metadata_name, m_gamedef);
-               meta->setOwner(player_name);
-               setNodeMetadata(p, meta);
+               if(!meta){
+                       errorstream<<"Failed to create node metadata \""
+                                       <<metadata_name<<"\""<<std::endl;
+               } else {
+                       meta->setOwner(player_name);
+                       setNodeMetadata(p, meta);
+               }
        }
 
        /*
@@ -2011,7 +2016,7 @@ ServerMap::ServerMap(std::string savedir, IGameDef *gamedef):
        emergeSector(v2s16(0,0));
 
        // Initially write whole map
-       save(false);
+       save(MOD_STATE_CLEAN);
 }
 
 ServerMap::~ServerMap()
@@ -2023,7 +2028,7 @@ ServerMap::~ServerMap()
                if(m_map_saving_enabled)
                {
                        // Save only changed parts
-                       save(true);
+                       save(MOD_STATE_WRITE_AT_UNLOAD);
                        infostream<<"Server: saved map to "<<m_savedir<<std::endl;
                }
                else
@@ -2162,7 +2167,17 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
 
        /*infostream<<"Resulting vmanip:"<<std::endl;
        data->vmanip.print(infostream);*/
-       
+
+       // Make sure affected blocks are loaded
+       for(s16 x=-1; x<=1; x++)
+       for(s16 z=-1; z<=1; z++)
+       for(s16 y=-1; y<=1; y++)
+       {
+               v3s16 p(blockpos.X+x, blockpos.Y+y, blockpos.Z+z);
+               // Load from disk if not already in memory
+               emergeBlock(p, false);
+       }
+
        /*
                Blit generated stuff to map
                NOTE: blitBackAll adds nearly everything to changed_blocks
@@ -2314,7 +2329,7 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
                Save changed parts of map
                NOTE: Will be saved later.
        */
-       //save(true);
+       //save(MOD_STATE_WRITE_AT_UNLOAD);
 
        /*infostream<<"finishBlockMake() done for ("<<blockpos.X<<","<<blockpos.Y<<","
                        <<blockpos.Z<<")"<<std::endl;*/
@@ -2822,7 +2837,7 @@ std::string ServerMap::getBlockFilename(v3s16 p)
        return cc;
 }
 
-void ServerMap::save(bool only_changed)
+void ServerMap::save(ModifiedState save_level)
 {
        DSTACK(__FUNCTION_NAME);
        if(m_map_saving_enabled == false)
@@ -2831,11 +2846,11 @@ void ServerMap::save(bool only_changed)
                return;
        }
        
-       if(only_changed == false)
+       if(save_level == MOD_STATE_CLEAN)
                infostream<<"ServerMap: Saving whole map, this can take time."
                                <<std::endl;
        
-       if(only_changed == false || m_map_metadata_changed)
+       if(m_map_metadata_changed || save_level == MOD_STATE_CLEAN)
        {
                saveMapMeta();
        }
@@ -2856,7 +2871,7 @@ void ServerMap::save(bool only_changed)
                ServerMapSector *sector = (ServerMapSector*)i.getNode()->getValue();
                assert(sector->getId() == MAPSECTOR_SERVER);
        
-               if(sector->differs_from_disk || only_changed == false)
+               if(sector->differs_from_disk || save_level == MOD_STATE_CLEAN)
                {
                        saveSectorMeta(sector);
                        sector_meta_count++;
@@ -2871,8 +2886,7 @@ void ServerMap::save(bool only_changed)
                        
                        block_count_all++;
 
-                       if(block->getModified() >= MOD_STATE_WRITE_NEEDED 
-                                       || only_changed == false)
+                       if(block->getModified() >= save_level)
                        {
                                // Lazy beginSave()
                                if(!save_started){
@@ -2899,7 +2913,7 @@ void ServerMap::save(bool only_changed)
        /*
                Only print if something happened or saved whole map
        */
-       if(only_changed == false || sector_meta_count != 0
+       if(save_level == MOD_STATE_CLEAN || sector_meta_count != 0
                        || block_count != 0)
        {
                infostream<<"ServerMap: Written: "