Remove liquid_finite and weather

[dragonfireclient.git] / src / mapblock.cpp

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index 3fb2ec5eda0bd3bfc8f0141d3f545f752f98cf63..95e54fb33ce849ced6f6452ee50da21e376c3d5b 100644 (file)
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -43,9 +43,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 MapBlock::MapBlock(Map *parent, v3s16 pos, IGameDef *gamedef, bool dummy):
-               heat(0),
-               humidity(0),
-               weather_update_time(0),
                m_parent(parent),
                m_pos(pos),
                m_gamedef(gamedef),
@@ -67,7 +64,6 @@ MapBlock::MapBlock(Map *parent, v3s16 pos, IGameDef *gamedef, bool dummy):
                reallocate();
        
 #ifndef SERVER
-       //mesh_mutex.Init();
        mesh = NULL;
 #endif
 }
@@ -647,8 +643,8 @@ void MapBlock::serializeNetworkSpecific(std::ostream &os, u16 net_proto_version)
        if(net_proto_version >= 21){
                int version = 1;
                writeU8(os, version);
-               writeF1000(os, heat);
-               writeF1000(os, humidity);
+               writeF1000(os, 0); // deprecated heat
+               writeF1000(os, 0); // deprecated humidity
        }
 }
 
@@ -764,8 +760,8 @@ void MapBlock::deSerializeNetworkSpecific(std::istream &is)
                //if(version != 1)
                //      throw SerializationError("unsupported MapBlock version");
                if(version >= 1) {
-                       heat = readF1000(is);
-                       humidity = readF1000(is);
+                       readF1000(is); // deprecated heat
+                       readF1000(is); // deprecated humidity
                }
        }
        catch(SerializationError &e)