From c4315a7afafcc9adff945b5e63800340f6c2c008 Mon Sep 17 00:00:00 2001 From: darkrose Date: Fri, 1 Jun 2012 23:10:53 +1000 Subject: Strip unneeded variables from NodeMetadata --- src/content_nodemeta.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/content_nodemeta.cpp') diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp index 1ade1ee76..18690612d 100644 --- a/src/content_nodemeta.cpp +++ b/src/content_nodemeta.cpp @@ -40,10 +40,10 @@ static bool content_nodemeta_deserialize_legacy_body( deSerializeLongString(is); // m_text deSerializeString(is); // m_owner - meta->setInfoText(deSerializeString(is)); - meta->setInventoryDrawSpec(deSerializeString(is)); + meta->setString("infotext",deSerializeString(is)); + meta->setString("formspec",deSerializeString(is)); readU8(is); // m_allow_text_input - meta->setAllowRemoval(readU8(is) == 0); + readU8(is); // m_allow_removal readU8(is); // m_enforce_owner int num_vars = readU32(is); @@ -57,14 +57,14 @@ static bool content_nodemeta_deserialize_legacy_body( else if(id == NODEMETA_SIGN) // SignNodeMetadata { meta->setString("text", deSerializeLongString(is)); - meta->setInfoText("\"${text}\""); - meta->setFormSpec("field[text;;${text}]"); + meta->setString("infotext","\"${text}\""); + meta->setString("formspec","field[text;;${text}]"); return false; } else if(id == NODEMETA_CHEST) // ChestNodeMetadata { meta->getInventory()->deSerialize(is); - meta->setInventoryDrawSpec("invsize[8,9;]" + meta->setString("formspec","invsize[8,9;]" "list[current_name;0;0,0;8,4;]" "list[current_player;main;0,5;8,4;]"); return false; @@ -73,7 +73,7 @@ static bool content_nodemeta_deserialize_legacy_body( { meta->setString("owner", deSerializeString(is)); meta->getInventory()->deSerialize(is); - meta->setInventoryDrawSpec("invsize[8,9;]" + meta->setString("formspec","invsize[8,9;]" "list[current_name;0;0,0;8,4;]" "list[current_player;main;0,5;8,4;]"); return false; @@ -94,7 +94,7 @@ static bool content_nodemeta_deserialize_legacy_body( is>>temp; meta->setString("src_time", ftos((float)temp/10)); - meta->setInventoryDrawSpec("invsize[8,9;]" + meta->setString("formspec","invsize[8,9;]" "list[current_name;fuel;2,3;1,1;]" "list[current_name;src;2,1;1,1;]" "list[current_name;dst;5,1;2,2;]" -- cgit v1.2.3