ToolDefManager serialization

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

diff --git a/src/luaentity_common.cpp b/src/luaentity_common.cpp
index 6ce20123651bf0f8cd587d6cb967c47a9ea26500..138e72dcbba67993696bdf3f94c12dc61f0060c0 100644 (file)
--- a/src/luaentity_common.cpp
+++ b/src/luaentity_common.cpp
@@ -29,7 +29,7 @@ LuaEntityProperties::LuaEntityProperties():
        collisionbox(-0.5,-0.5,-0.5, 0.5,0.5,0.5),
        visual("single_sprite")
 {
-       textures.push_back("unknown_block.png");
+       textures.push_back("unknown_object.png");
 }
 
 std::string LuaEntityProperties::dump()
@@ -40,9 +40,8 @@ std::string LuaEntityProperties::dump()
        os<<", collisionbox="<<PP(collisionbox.MinEdge)<<","<<PP(collisionbox.MaxEdge);
        os<<", visual="<<visual;
        os<<", textures=[";
-       for(core::list<std::string>::Iterator i = textures.begin();
-                       i != textures.end(); i++){
-               os<<"\""<<(*i)<<"\" ";
+       for(u32 i=0; i<textures.size(); i++){
+               os<<"\""<<textures[i]<<"\" ";
        }
        os<<"]";
        return os.str();
@@ -57,9 +56,8 @@ void LuaEntityProperties::serialize(std::ostream &os)
        writeV3F1000(os, collisionbox.MaxEdge);
        os<<serializeString(visual);
        writeU16(os, textures.size());
-       for(core::list<std::string>::Iterator i = textures.begin();
-                       i != textures.end(); i++){
-               os<<serializeString(*i);
+       for(u32 i=0; i<textures.size(); i++){
+               os<<serializeString(textures[i]);
        }
 }
 
@@ -74,8 +72,8 @@ void LuaEntityProperties::deSerialize(std::istream &is)
        collisionbox.MaxEdge = readV3F1000(is);
        visual = deSerializeString(is);
        textures.clear();
-       int texture_count = readU16(is);
-       for(int i=0; i<texture_count; i++){
+       u32 texture_count = readU16(is);
+       for(u32 i=0; i<texture_count; i++){
                textures.push_back(deSerializeString(is));
        }
 }