aboutsummaryrefslogtreecommitdiff
path: root/src/content_nodemeta.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/content_nodemeta.cpp')
-rw-r--r--src/content_nodemeta.cpp115
1 files changed, 52 insertions, 63 deletions
diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index fc2859d27..7d38fb78b 100644
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -40,99 +40,92 @@ static bool content_nodemeta_deserialize_legacy_body(
{
meta->clear();
- if(id == NODEMETA_GENERIC) // GenericNodeMetadata (0.4-dev)
+ if (id == NODEMETA_GENERIC) // GenericNodeMetadata (0.4-dev)
{
meta->getInventory()->deSerialize(is);
- deSerializeLongString(is); // m_text
- deSerializeString(is); // m_owner
+ deSerializeLongString(is); // m_text
+ deSerializeString(is); // m_owner
- meta->setString("infotext",deSerializeString(is));
- meta->setString("formspec",deSerializeString(is));
- readU8(is); // m_allow_text_input
- readU8(is); // m_allow_removal
- readU8(is); // m_enforce_owner
+ meta->setString("infotext", deSerializeString(is));
+ meta->setString("formspec", deSerializeString(is));
+ readU8(is); // m_allow_text_input
+ readU8(is); // m_allow_removal
+ readU8(is); // m_enforce_owner
int num_vars = readU32(is);
- for(int i=0; i<num_vars; i++){
+ for (int i = 0; i < num_vars; i++) {
std::string name = deSerializeString(is);
std::string var = deSerializeLongString(is);
meta->setString(name, var);
}
return false;
- }
- else if(id == NODEMETA_SIGN) // SignNodeMetadata
+ } else if (id == NODEMETA_SIGN) // SignNodeMetadata
{
meta->setString("text", deSerializeString(is));
- //meta->setString("infotext","\"${text}\"");
+ // meta->setString("infotext","\"${text}\"");
meta->setString("infotext",
std::string("\"") + meta->getString("text") + "\"");
- meta->setString("formspec","field[text;;${text}]");
+ meta->setString("formspec", "field[text;;${text}]");
return false;
- }
- else if(id == NODEMETA_CHEST) // ChestNodeMetadata
+ } else if (id == NODEMETA_CHEST) // ChestNodeMetadata
{
meta->getInventory()->deSerialize(is);
// Rename inventory list "0" to "main"
Inventory *inv = meta->getInventory();
- if(!inv->getList("main") && inv->getList("0")){
+ if (!inv->getList("main") && inv->getList("0")) {
inv->getList("0")->setName("main");
}
assert(inv->getList("main") && !inv->getList("0"));
- meta->setString("formspec","size[8,9]"
- "list[current_name;main;0,0;8,4;]"
- "list[current_player;main;0,5;8,4;]");
+ meta->setString("formspec", "size[8,9]"
+ "list[current_name;main;0,0;8,4;]"
+ "list[current_player;main;0,5;8,4;]");
return false;
- }
- else if(id == NODEMETA_LOCKABLE_CHEST) // LockingChestNodeMetadata
+ } else if (id == NODEMETA_LOCKABLE_CHEST) // LockingChestNodeMetadata
{
meta->setString("owner", deSerializeString(is));
meta->getInventory()->deSerialize(is);
// Rename inventory list "0" to "main"
Inventory *inv = meta->getInventory();
- if(!inv->getList("main") && inv->getList("0")){
+ if (!inv->getList("main") && inv->getList("0")) {
inv->getList("0")->setName("main");
}
assert(inv->getList("main") && !inv->getList("0"));
- meta->setString("formspec","size[8,9]"
- "list[current_name;main;0,0;8,4;]"
- "list[current_player;main;0,5;8,4;]");
+ meta->setString("formspec", "size[8,9]"
+ "list[current_name;main;0,0;8,4;]"
+ "list[current_player;main;0,5;8,4;]");
return false;
- }
- else if(id == NODEMETA_FURNACE) // FurnaceNodeMetadata
+ } else if (id == NODEMETA_FURNACE) // FurnaceNodeMetadata
{
meta->getInventory()->deSerialize(is);
int temp = 0;
- is>>temp;
- meta->setString("fuel_totaltime", ftos((float)temp/10));
+ is >> temp;
+ meta->setString("fuel_totaltime", ftos((float)temp / 10));
temp = 0;
- is>>temp;
- meta->setString("fuel_time", ftos((float)temp/10));
+ is >> temp;
+ meta->setString("fuel_time", ftos((float)temp / 10));
temp = 0;
- is>>temp;
- //meta->setString("src_totaltime", ftos((float)temp/10));
+ is >> temp;
+ // meta->setString("src_totaltime", ftos((float)temp/10));
temp = 0;
- is>>temp;
- meta->setString("src_time", ftos((float)temp/10));
-
- meta->setString("formspec","size[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;]"
- "list[current_player;main;0,5;8,4;]");
+ is >> temp;
+ meta->setString("src_time", ftos((float)temp / 10));
+
+ meta->setString("formspec", "size[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;]"
+ "list[current_player;main;0,5;8,4;]");
return true;
- }
- else
- {
+ } else {
throw SerializationError("Unknown legacy node metadata");
}
}
-static bool content_nodemeta_deserialize_legacy_meta(
- std::istream &is, NodeMetadata *meta)
+static bool content_nodemeta_deserialize_legacy_meta(std::istream &is, NodeMetadata *meta)
{
// Read id
s16 id = readS16(is);
@@ -143,41 +136,37 @@ static bool content_nodemeta_deserialize_legacy_meta(
return content_nodemeta_deserialize_legacy_body(tmp_is, id, meta);
}
-void content_nodemeta_deserialize_legacy(std::istream &is,
- NodeMetadataList *meta, NodeTimerList *timers,
- IItemDefManager *item_def_mgr)
+void content_nodemeta_deserialize_legacy(std::istream &is, NodeMetadataList *meta,
+ NodeTimerList *timers, IItemDefManager *item_def_mgr)
{
meta->clear();
timers->clear();
u16 version = readU16(is);
- if(version > 1)
- {
- infostream<<FUNCTION_NAME<<": version "<<version<<" not supported"
- <<std::endl;
+ if (version > 1) {
+ infostream << FUNCTION_NAME << ": version " << version << " not supported"
+ << std::endl;
throw SerializationError(FUNCTION_NAME);
}
u16 count = readU16(is);
- for(u16 i=0; i<count; i++)
- {
+ for (u16 i = 0; i < count; i++) {
u16 p16 = readU16(is);
- v3s16 p(0,0,0);
+ v3s16 p(0, 0, 0);
p.Z += p16 / MAP_BLOCKSIZE / MAP_BLOCKSIZE;
p16 -= p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE;
p.Y += p16 / MAP_BLOCKSIZE;
p16 -= p.Y * MAP_BLOCKSIZE;
p.X += p16;
- if(meta->get(p) != NULL)
- {
- warningstream<<FUNCTION_NAME<<": "
- <<"already set data at position"
- <<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring."
- <<std::endl;
+ if (meta->get(p) != NULL) {
+ warningstream << FUNCTION_NAME << ": "
+ << "already set data at position"
+ << "(" << p.X << "," << p.Y << "," << p.Z
+ << "): Ignoring." << std::endl;
continue;
}
@@ -185,7 +174,7 @@ void content_nodemeta_deserialize_legacy(std::istream &is,
bool need_timer = content_nodemeta_deserialize_legacy_meta(is, data);
meta->set(p, data);
- if(need_timer)
+ if (need_timer)
timers->set(NodeTimer(1., 0., p));
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-09 22:42:59 +0000