Skip to content

Commit b55fc3d

Browse files
nerzhulnerzhul
committedMar 31, 2019
mapgen: drop mapgen id from child mapgens.
This id must be owned by the child mapgen and never be set to a misc value by a developer Also use nullptr in some places
·
5.11.05.1.0
1 parent b3716a0 commit b55fc3d

18 files changed

+36
-40
lines changed
 

Diff for: ‎src/map_settings_manager.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ MapgenParams *MapSettingsManager::makeMapgenParams()
174174

175175
// Create our MapgenParams
176176
MapgenParams *params = Mapgen::createMapgenParams(mgtype);
177-
if (params == NULL)
178-
return NULL;
177+
if (!params)
178+
return nullptr;
179179

180180
params->mgtype = mgtype;
181181

Diff for: ‎src/mapgen/mapgen.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -153,23 +153,23 @@ Mapgen *Mapgen::createMapgen(MapgenType mgtype, int mgid,
153153
{
154154
switch (mgtype) {
155155
case MAPGEN_CARPATHIAN:
156-
return new MapgenCarpathian(mgid, (MapgenCarpathianParams *)params, emerge);
156+
return new MapgenCarpathian((MapgenCarpathianParams *)params, emerge);
157157
case MAPGEN_FLAT:
158-
return new MapgenFlat(mgid, (MapgenFlatParams *)params, emerge);
158+
return new MapgenFlat((MapgenFlatParams *)params, emerge);
159159
case MAPGEN_FRACTAL:
160-
return new MapgenFractal(mgid, (MapgenFractalParams *)params, emerge);
160+
return new MapgenFractal((MapgenFractalParams *)params, emerge);
161161
case MAPGEN_SINGLENODE:
162-
return new MapgenSinglenode(mgid, (MapgenSinglenodeParams *)params, emerge);
162+
return new MapgenSinglenode((MapgenSinglenodeParams *)params, emerge);
163163
case MAPGEN_V5:
164-
return new MapgenV5(mgid, (MapgenV5Params *)params, emerge);
164+
return new MapgenV5((MapgenV5Params *)params, emerge);
165165
case MAPGEN_V6:
166-
return new MapgenV6(mgid, (MapgenV6Params *)params, emerge);
166+
return new MapgenV6((MapgenV6Params *)params, emerge);
167167
case MAPGEN_V7:
168-
return new MapgenV7(mgid, (MapgenV7Params *)params, emerge);
168+
return new MapgenV7((MapgenV7Params *)params, emerge);
169169
case MAPGEN_VALLEYS:
170-
return new MapgenValleys(mgid, (MapgenValleysParams *)params, emerge);
170+
return new MapgenValleys((MapgenValleysParams *)params, emerge);
171171
default:
172-
return NULL;
172+
return nullptr;
173173
}
174174
}
175175

@@ -194,7 +194,7 @@ MapgenParams *Mapgen::createMapgenParams(MapgenType mgtype)
194194
case MAPGEN_VALLEYS:
195195
return new MapgenValleysParams;
196196
default:
197-
return NULL;
197+
return nullptr;
198198
}
199199
}
200200

Diff for: ‎src/mapgen/mapgen_carpathian.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ FlagDesc flagdesc_mapgen_carpathian[] = {
5050
///////////////////////////////////////////////////////////////////////////////
5151

5252

53-
MapgenCarpathian::MapgenCarpathian(
54-
int mapgenid, MapgenCarpathianParams *params, EmergeManager *emerge)
55-
: MapgenBasic(mapgenid, params, emerge)
53+
MapgenCarpathian::MapgenCarpathian(MapgenCarpathianParams *params, EmergeManager *emerge)
54+
: MapgenBasic(MAPGEN_CARPATHIAN, params, emerge)
5655
{
5756
base_level = params->base_level;
5857

Diff for: ‎src/mapgen/mapgen_carpathian.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ struct MapgenCarpathianParams : public MapgenParams
7171
class MapgenCarpathian : public MapgenBasic
7272
{
7373
public:
74-
MapgenCarpathian(int mapgenid, MapgenCarpathianParams *params,
75-
EmergeManager *emerge);
74+
MapgenCarpathian(MapgenCarpathianParams *params, EmergeManager *emerge);
7675
~MapgenCarpathian();
7776

7877
virtual MapgenType getType() const { return MAPGEN_CARPATHIAN; }

Diff for: ‎src/mapgen/mapgen_flat.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ FlagDesc flagdesc_mapgen_flat[] = {
4848
///////////////////////////////////////////////////////////////////////////////////////
4949

5050

51-
MapgenFlat::MapgenFlat(int mapgenid, MapgenFlatParams *params, EmergeManager *emerge)
52-
: MapgenBasic(mapgenid, params, emerge)
51+
MapgenFlat::MapgenFlat(MapgenFlatParams *params, EmergeManager *emerge)
52+
: MapgenBasic(MAPGEN_FLAT, params, emerge)
5353
{
5454
spflags = params->spflags;
5555
ground_level = params->ground_level;

Diff for: ‎src/mapgen/mapgen_flat.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ struct MapgenFlatParams : public MapgenParams
5959
class MapgenFlat : public MapgenBasic
6060
{
6161
public:
62-
MapgenFlat(int mapgenid, MapgenFlatParams *params, EmergeManager *emerge);
62+
MapgenFlat(MapgenFlatParams *params, EmergeManager *emerge);
6363
~MapgenFlat();
6464

6565
virtual MapgenType getType() const { return MAPGEN_FLAT; }

Diff for: ‎src/mapgen/mapgen_fractal.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ FlagDesc flagdesc_mapgen_fractal[] = {
4747
///////////////////////////////////////////////////////////////////////////////////////
4848

4949

50-
MapgenFractal::MapgenFractal(int mapgenid, MapgenFractalParams *params, EmergeManager *emerge)
51-
: MapgenBasic(mapgenid, params, emerge)
50+
MapgenFractal::MapgenFractal(MapgenFractalParams *params, EmergeManager *emerge)
51+
: MapgenBasic(MAPGEN_FRACTAL, params, emerge)
5252
{
5353
spflags = params->spflags;
5454
cave_width = params->cave_width;

Diff for: ‎src/mapgen/mapgen_fractal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ struct MapgenFractalParams : public MapgenParams
6262
class MapgenFractal : public MapgenBasic
6363
{
6464
public:
65-
MapgenFractal(int mapgenid, MapgenFractalParams *params, EmergeManager *emerge);
65+
MapgenFractal(MapgenFractalParams *params, EmergeManager *emerge);
6666
~MapgenFractal();
6767

6868
virtual MapgenType getType() const { return MAPGEN_FRACTAL; }

Diff for: ‎src/mapgen/mapgen_singlenode.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2929
#include "emerge.h"
3030

3131

32-
MapgenSinglenode::MapgenSinglenode(int mapgenid,
33-
MapgenParams *params, EmergeManager *emerge)
34-
: Mapgen(mapgenid, params, emerge)
32+
MapgenSinglenode::MapgenSinglenode(MapgenParams *params, EmergeManager *emerge)
33+
: Mapgen(MAPGEN_SINGLENODE, params, emerge)
3534
{
3635
const NodeDefManager *ndef = emerge->ndef;
3736

Diff for: ‎src/mapgen/mapgen_singlenode.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class MapgenSinglenode : public Mapgen
3838
content_t c_node;
3939
u8 set_light;
4040

41-
MapgenSinglenode(int mapgenid, MapgenParams *params, EmergeManager *emerge);
41+
MapgenSinglenode(MapgenParams *params, EmergeManager *emerge);
4242
~MapgenSinglenode() = default;
4343

4444
virtual MapgenType getType() const { return MAPGEN_SINGLENODE; }

Diff for: ‎src/mapgen/mapgen_v5.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ FlagDesc flagdesc_mapgen_v5[] = {
4545
};
4646

4747

48-
MapgenV5::MapgenV5(int mapgenid, MapgenV5Params *params, EmergeManager *emerge)
49-
: MapgenBasic(mapgenid, params, emerge)
48+
MapgenV5::MapgenV5(MapgenV5Params *params, EmergeManager *emerge)
49+
: MapgenBasic(MAPGEN_V5, params, emerge)
5050
{
5151
spflags = params->spflags;
5252
cave_width = params->cave_width;

Diff for: ‎src/mapgen/mapgen_v5.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ struct MapgenV5Params : public MapgenParams
5959
class MapgenV5 : public MapgenBasic
6060
{
6161
public:
62-
MapgenV5(int mapgenid, MapgenV5Params *params, EmergeManager *emerge);
62+
MapgenV5(MapgenV5Params *params, EmergeManager *emerge);
6363
~MapgenV5();
6464

6565
virtual MapgenType getType() const { return MAPGEN_V5; }

Diff for: ‎src/mapgen/mapgen_v6.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ FlagDesc flagdesc_mapgen_v6[] = {
5555
/////////////////////////////////////////////////////////////////////////////
5656

5757

58-
MapgenV6::MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge)
59-
: Mapgen(mapgenid, params, emerge)
58+
MapgenV6::MapgenV6(MapgenV6Params *params, EmergeManager *emerge)
59+
: Mapgen(MAPGEN_V6, params, emerge)
6060
{
6161
m_emerge = emerge;
6262
ystride = csize.X; //////fix this

Diff for: ‎src/mapgen/mapgen_v6.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class MapgenV6 : public Mapgen {
132132
content_t c_stair_cobble;
133133
content_t c_stair_desert_stone;
134134

135-
MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge);
135+
MapgenV6(MapgenV6Params *params, EmergeManager *emerge);
136136
~MapgenV6();
137137

138138
virtual MapgenType getType() const { return MAPGEN_V6; }

Diff for: ‎src/mapgen/mapgen_v7.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ FlagDesc flagdesc_mapgen_v7[] = {
5252
////////////////////////////////////////////////////////////////////////////////
5353

5454

55-
MapgenV7::MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge)
56-
: MapgenBasic(mapgenid, params, emerge)
55+
MapgenV7::MapgenV7(MapgenV7Params *params, EmergeManager *emerge)
56+
: MapgenBasic(MAPGEN_V7, params, emerge)
5757
{
5858
spflags = params->spflags;
5959
mount_zero_level = params->mount_zero_level;

Diff for: ‎src/mapgen/mapgen_v7.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ struct MapgenV7Params : public MapgenParams {
7777

7878
class MapgenV7 : public MapgenBasic {
7979
public:
80-
MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge);
80+
MapgenV7(MapgenV7Params *params, EmergeManager *emerge);
8181
~MapgenV7();
8282

8383
virtual MapgenType getType() const { return MAPGEN_V7; }

Diff for: ‎src/mapgen/mapgen_valleys.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@ FlagDesc flagdesc_mapgen_valleys[] = {
5454
};
5555

5656

57-
MapgenValleys::MapgenValleys(int mapgenid, MapgenValleysParams *params,
58-
EmergeManager *emerge)
59-
: MapgenBasic(mapgenid, params, emerge)
57+
MapgenValleys::MapgenValleys(MapgenValleysParams *params, EmergeManager *emerge)
58+
: MapgenBasic(MAPGEN_VALLEYS, params, emerge)
6059
{
6160
// NOTE: MapgenValleys has a hard dependency on BiomeGenOriginal
6261
m_bgen = (BiomeGenOriginal *)biomegen;

Diff for: ‎src/mapgen/mapgen_valleys.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ struct MapgenValleysParams : public MapgenParams {
7979
class MapgenValleys : public MapgenBasic {
8080
public:
8181

82-
MapgenValleys(int mapgenid, MapgenValleysParams *params,
82+
MapgenValleys(MapgenValleysParams *params,
8383
EmergeManager *emerge);
8484
~MapgenValleys();
8585

0 commit comments

Comments
 (0)
Please sign in to comment.