mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
Various style cleanups + unused code removal
-> Don't pass pointer to whole IGameDef to NodeMetadata constructors and deserializers, but only to IItemDefManager, which is needed -> Remove the unused content_mapnode_get_new_name() method -> Fix style for MapBlock::deSerialize and MapBlock::deSerialize_pre22, improving accuracy of error messages a bit -> Fix style at other serialisation methods too -> Improve accuracy of some comments
This commit is contained in:
parent
9c635f28ac
commit
452df1c723
11 changed files with 75 additions and 169 deletions
|
@ -79,7 +79,7 @@ static bool content_nodemeta_deserialize_legacy_body(
|
|||
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;]");
|
||||
|
@ -96,7 +96,7 @@ static bool content_nodemeta_deserialize_legacy_body(
|
|||
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;]");
|
||||
|
@ -145,7 +145,7 @@ static bool content_nodemeta_deserialize_legacy_meta(
|
|||
|
||||
void content_nodemeta_deserialize_legacy(std::istream &is,
|
||||
NodeMetadataList *meta, NodeTimerList *timers,
|
||||
IGameDef *gamedef)
|
||||
IItemDefManager *item_def_mgr)
|
||||
{
|
||||
meta->clear();
|
||||
timers->clear();
|
||||
|
@ -181,7 +181,7 @@ void content_nodemeta_deserialize_legacy(std::istream &is,
|
|||
continue;
|
||||
}
|
||||
|
||||
NodeMetadata *data = new NodeMetadata(gamedef);
|
||||
NodeMetadata *data = new NodeMetadata(item_def_mgr);
|
||||
bool need_timer = content_nodemeta_deserialize_legacy_meta(is, data);
|
||||
meta->set(p, data);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue