Improve glass

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

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 996b20781944a70fd7ba4fc34dc1a6bd3c0561d1..c86a3aefcb8528071f6158a47a8a6aa4b942f86b 100644 (file)
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -451,6 +451,7 @@ public:
        }
        void serialize(std::ostream &os)
        {
+               u16 count = 0;
                std::ostringstream tmp_os(std::ios::binary);
                for(u16 i=0; i<=MAX_CONTENT; i++)
                {
@@ -459,14 +460,17 @@ public:
                                continue;
                        writeU16(tmp_os, i);
                        f->serialize(tmp_os);
+                       count++;
                }
+               writeU16(os, count);
                os<<serializeLongString(tmp_os.str());
        }
        void deSerialize(std::istream &is, IGameDef *gamedef)
        {
                clear();
+               u16 count = readU16(is);
                std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
-               while(!tmp_is.eof()){
+               for(u16 n=0; n<count; n++){
                        u16 i = readU16(tmp_is);
                        if(i > MAX_CONTENT){
                                errorstream<<"ContentFeatures::deSerialize(): "