Fixed issue with map templates not getting the same plane set as thei…

…r world
Andrettin · Dec 22, 2020 · 8e56694 · 8e56694
1 parent 5a26f47
commit 8e56694
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/src/map/map_template.cpp b/src/map/map_template.cpp
@@ -190,7 +190,7 @@ void map_template::ProcessConfigData(const CConfigData *config_data)
 			this->plane = plane;
 		} else if (key == "world") {
 			wyrmgus::world *world = world::get(value);
-			this->set_world(world);
+			this->world = world;
 		} else if (key == "terrain_file") {
 			this->terrain_file = value;
 		} else if (key == "overlay_terrain_file") {
@@ -324,6 +324,10 @@ void map_template::check() const
 
 void map_template::initialize()
 {
+	if (this->plane == nullptr && this->world != nullptr) {
+		this->plane = this->world->get_plane();
+	}
+
 	if (this->get_subtemplate_top_left_pos().x() == -1 && this->get_subtemplate_top_left_pos().y() == -1 && this->get_subtemplate_center_pos().x() == -1 && this->get_subtemplate_center_pos().y() == -1) {
 		const QPoint subtemplate_offset = size::to_point(this->get_applied_size()) - QPoint(1, 1) / 2;
 		this->subtemplate_top_left_pos = this->get_subtemplate_center_pos() - subtemplate_offset;
@@ -2076,16 +2080,6 @@ QSize map_template::get_applied_size() const
 	return applied_size;
 }
 
-void map_template::set_world(wyrmgus::world *world)
-{
-	if (world == this->get_world()) {
-		return;
-	}
-
-	this->world = world;
-	this->plane = this->world->get_plane();
-}
-
 void map_template::set_terrain_file(const std::filesystem::path &filepath)
 {
 	if (filepath == this->get_terrain_file()) {

diff --git a/src/map/map_template.h b/src/map/map_template.h
@@ -103,7 +103,7 @@ class map_template final : public named_data_entry, public data_type<map_templat
 	Q_PROPERTY(QGeoCoordinate min_subtemplate_geocoordinate MEMBER min_subtemplate_geocoordinate)
 	Q_PROPERTY(QGeoCoordinate max_subtemplate_geocoordinate MEMBER max_subtemplate_geocoordinate)
 	Q_PROPERTY(wyrmgus::plane* plane MEMBER plane)
-	Q_PROPERTY(wyrmgus::world* world MEMBER world WRITE set_world)
+	Q_PROPERTY(wyrmgus::world* world MEMBER world)
 	Q_PROPERTY(wyrmgus::map_template* main_template READ get_main_template WRITE set_main_template)
 	Q_PROPERTY(QString terrain_file READ get_terrain_file_qstring)
 	Q_PROPERTY(QString overlay_terrain_file READ get_overlay_terrain_file_qstring)
@@ -380,8 +380,6 @@ class map_template final : public named_data_entry, public data_type<map_templat
 		return this->world;
 	}
 
-	void set_world(wyrmgus::world *world);
-
 	map_template *get_main_template() const
 	{
 		return this->main_template;