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_singlenode.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mapgen_singlenode.h') diff --git a/src/mapgen_singlenode.h b/src/mapgen_singlenode.h index e2eb1bb90..eba85e7ce 100644 --- a/src/mapgen_singlenode.h +++ b/src/mapgen_singlenode.h @@ -22,12 +22,12 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapgen.h" -struct MapgenSinglenodeParams : public MapgenParams { +struct MapgenSinglenodeParams : public MapgenSpecificParams { MapgenSinglenodeParams() {} ~MapgenSinglenodeParams() {} - bool readParams(Settings *settings); + void readParams(Settings *settings); void writeParams(Settings *settings); }; @@ -35,7 +35,7 @@ class MapgenSinglenode : public Mapgen { public: u32 flags; - MapgenSinglenode(int mapgenid, MapgenSinglenodeParams *params); + MapgenSinglenode(int mapgenid, MapgenParams *params); ~MapgenSinglenode(); void makeChunk(BlockMakeData *data); @@ -44,10 +44,10 @@ public: struct MapgenFactorySinglenode : public MapgenFactory { Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) { - return new MapgenSinglenode(mgid, (MapgenSinglenodeParams *)params); + return new MapgenSinglenode(mgid, params); }; - MapgenParams *createMapgenParams() { + MapgenSpecificParams *createMapgenParams() { return new MapgenSinglenodeParams(); }; }; -- cgit v1.2.3