Code modernization: src/m* (part 3)

[dragonfireclient.git] / src / mapgen_singlenode.h

diff --git a/src/mapgen_singlenode.h b/src/mapgen_singlenode.h
index 35f2ba3851738f1c8b77ca0f4aa2e269a8a5c6c2..7678613e5866de512e2a32d8bb10e74c82a9c046 100644 (file)
--- a/src/mapgen_singlenode.h
+++ b/src/mapgen_singlenode.h
@@ -1,6 +1,8 @@
 /*
 Minetest
-Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013-2015 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013-2016 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2015-2017 paramat
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -17,40 +19,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MAPGEN_SINGLENODE_HEADER
-#define MAPGEN_SINGLENODE_HEADER
+#pragma once
 
 #include "mapgen.h"
 
-struct MapgenSinglenodeParams : public MapgenSpecificParams {
-       
-       MapgenSinglenodeParams() {}
-       ~MapgenSinglenodeParams() {}
-       
+struct MapgenSinglenodeParams : public MapgenParams
+{
+       MapgenSinglenodeParams() = default;
+       ~MapgenSinglenodeParams() = default;
+
        void readParams(const Settings *settings) {}
        void writeParams(Settings *settings) const {}
 };
 
-class MapgenSinglenode : public Mapgen {
+class MapgenSinglenode : public Mapgen
+{
 public:
        u32 flags;
        content_t c_node;
+       u8 set_light;
 
        MapgenSinglenode(int mapgenid, MapgenParams *params, EmergeManager *emerge);
-       ~MapgenSinglenode();
-       
-       void makeChunk(BlockMakeData *data);
-       int getGroundLevelAtPoint(v2s16 p);
-};
+       ~MapgenSinglenode() = default;
 
-struct MapgenFactorySinglenode : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) {
-               return new MapgenSinglenode(mgid, params, emerge);
-       };
-       
-       MapgenSpecificParams *createMapgenParams() {
-               return new MapgenSinglenodeParams();
-       };
-};
+       virtual MapgenType getType() const { return MAPGEN_SINGLENODE; }
 
-#endif
+       void makeChunk(BlockMakeData *data);
+       int getSpawnLevelAtPoint(v2s16 p);
+};