From 358a62d9199381b243bd158911eb0a64646401d5 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 18 Jul 2020 14:36:14 +0200 Subject: [PATCH] Don't call setup() in set_data. --- data/planet_data.cpp | 2 +- main/biome.cpp | 2 -- main/dungeon.cpp | 2 -- main/dungeon_room.cpp | 2 -- main/planet.cpp | 2 -- 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/data/planet_data.cpp b/data/planet_data.cpp index 082610e..48d8d3f 100644 --- a/data/planet_data.cpp +++ b/data/planet_data.cpp @@ -199,7 +199,7 @@ Ref PlanetData::instance() { Ref planet; if (!_planet.is_valid()) { - planet.instance(); + planet.instance(); } else { planet = _planet->duplicate(); } diff --git a/main/biome.cpp b/main/biome.cpp index 534c2f0..84e288b 100644 --- a/main/biome.cpp +++ b/main/biome.cpp @@ -50,8 +50,6 @@ Ref Biome::get_data() { } void Biome::set_data(Ref value) { _data = value; - - setup(); } //// Prop Data //// diff --git a/main/dungeon.cpp b/main/dungeon.cpp index 360e52e..eec4040 100644 --- a/main/dungeon.cpp +++ b/main/dungeon.cpp @@ -101,8 +101,6 @@ Ref Dungeon::get_data() { } void Dungeon::set_data(Ref value) { _data = value; - - setup(); } //Rooms diff --git a/main/dungeon_room.cpp b/main/dungeon_room.cpp index 0c88d0e..d300250 100644 --- a/main/dungeon_room.cpp +++ b/main/dungeon_room.cpp @@ -94,8 +94,6 @@ Ref DungeonRoom::get_data() { } void DungeonRoom::set_data(Ref value) { _data = value; - - setup(); } #ifdef VOXELMAN_PRESENT diff --git a/main/planet.cpp b/main/planet.cpp index f9db7a8..551c11e 100644 --- a/main/planet.cpp +++ b/main/planet.cpp @@ -50,8 +50,6 @@ Ref Planet::get_data() { } void Planet::set_data(Ref value) { _data = value; - - setup(); } Ref Planet::get_biome(const int index) const {