oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

mapgen: drop mapgen id from child mapgens.

Browse source 
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
This commit is contained in:
Loïc Blot 2019-03-25 16:42:53 +01:00 • committed by Loïc Blot
parent b3716a03a6
commit b55fc3d773
18 changed files with 36 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/mapgen/mapgen.cpp
View file

@ -153,23 +153,23 @@ Mapgen *Mapgen::createMapgen(MapgenType mgtype, int mgid,
{
switch (mgtype) {
case MAPGEN_CARPATHIAN:
return new MapgenCarpathian(mgid, (MapgenCarpathianParams *)params, emerge);
return new MapgenCarpathian((MapgenCarpathianParams *)params, emerge);
case MAPGEN_FLAT:
return new MapgenFlat(mgid, (MapgenFlatParams *)params, emerge);
return new MapgenFlat((MapgenFlatParams *)params, emerge);
case MAPGEN_FRACTAL:
return new MapgenFractal(mgid, (MapgenFractalParams *)params, emerge);
return new MapgenFractal((MapgenFractalParams *)params, emerge);
case MAPGEN_SINGLENODE:
return new MapgenSinglenode(mgid, (MapgenSinglenodeParams *)params, emerge);
return new MapgenSinglenode((MapgenSinglenodeParams *)params, emerge);
case MAPGEN_V5:
return new MapgenV5(mgid, (MapgenV5Params *)params, emerge);
return new MapgenV5((MapgenV5Params *)params, emerge);
case MAPGEN_V6:
return new MapgenV6(mgid, (MapgenV6Params *)params, emerge);
return new MapgenV6((MapgenV6Params *)params, emerge);
case MAPGEN_V7:
return new MapgenV7(mgid, (MapgenV7Params *)params, emerge);
return new MapgenV7((MapgenV7Params *)params, emerge);
case MAPGEN_VALLEYS:
return new MapgenValleys(mgid, (MapgenValleysParams *)params, emerge);
return new MapgenValleys((MapgenValleysParams *)params, emerge);
default:
return NULL;
return nullptr;
}
}
@ -194,7 +194,7 @@ MapgenParams *Mapgen::createMapgenParams(MapgenType mgtype)
case MAPGEN_VALLEYS:
return new MapgenValleysParams;
default:
return NULL;
return nullptr;
}
}