From 5a34f40d80ea1a339b599bc11db549a6bd86912f Mon Sep 17 00:00:00 2001 From: kwolekr Date: Mon, 3 Feb 2014 22:42:10 -0500 Subject: Huge overhaul of the entire MapgenParams system MapgenParams is no longer a polymorphic class, eliminating the need for messy and bug-prone reallocations. Separation between the common and mapgen-specific parameters is now strongly defined. Mapgen parameters objects are now properly encapsulated within the proper subsystems. --- src/mapgen_math.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/mapgen_math.h') diff --git a/src/mapgen_math.h b/src/mapgen_math.h index 1bc404641..304a337c4 100644 --- a/src/mapgen_math.h +++ b/src/mapgen_math.h @@ -26,12 +26,12 @@ with this program; if not, write to the Free Software Foundation, Inc., struct MapgenMathParams : public MapgenV7Params { - MapgenMathParams() { - } + MapgenMathParams() {} + ~MapgenMathParams() {} Json::Value params; - bool readParams(Settings *settings); + void readParams(Settings *settings); void writeParams(Settings *settings); }; @@ -39,7 +39,7 @@ class MapgenMath : public MapgenV7 { public: MapgenMathParams * mg_params; - MapgenMath(int mapgenid, MapgenMathParams *mg_params, EmergeManager *emerge); + MapgenMath(int mapgenid, MapgenParams *mg_params, EmergeManager *emerge); ~MapgenMath(); int generateTerrain(); @@ -57,10 +57,10 @@ class MapgenMath : public MapgenV7 { struct MapgenFactoryMath : public MapgenFactory { Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) { - return new MapgenMath(mgid, (MapgenMathParams *)params, emerge); + return new MapgenMath(mgid, params, emerge); }; - MapgenParams *createMapgenParams() { + MapgenSpecificParams *createMapgenParams() { return new MapgenMathParams(); }; }; -- cgit v1.2.3