diff options
| author | kwolekr <kwolekr@minetest.net> | 2013-05-18 23:26:27 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2013-05-19 12:22:20 -0400 |
| commit | 93474c4218eee621a96e24324b1b41a55571f0df (patch) | |
| tree | dc74d8a27cfa853b4580159cde8c66e485c4f9f2 /src/mapgen_v6.h | |
| parent | f577facf79729a03bb274a27c9f50f0092cd3a40 (diff) | |
| download | minetest-93474c4218eee621a96e24324b1b41a55571f0df.tar.gz minetest-93474c4218eee621a96e24324b1b41a55571f0df.tar.bz2 minetest-93474c4218eee621a96e24324b1b41a55571f0df.zip | |
Remove no virtual dtor warnings, make MapgenParams contain actual NoiseParams
Diffstat (limited to 'src/mapgen_v6.h')
| -rw-r--r-- | src/mapgen_v6.h | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h index a0276fb59..8f456fd3f 100644 --- a/src/mapgen_v6.h +++ b/src/mapgen_v6.h @@ -45,35 +45,36 @@ extern NoiseParams nparams_v6_def_apple_trees; struct MapgenV6Params : public MapgenParams { float freq_desert; float freq_beach; - NoiseParams *np_terrain_base; - NoiseParams *np_terrain_higher; - NoiseParams *np_steepness; - NoiseParams *np_height_select; - NoiseParams *np_mud; - NoiseParams *np_beach; - NoiseParams *np_biome; - NoiseParams *np_cave; - NoiseParams *np_humidity; - NoiseParams *np_trees; - NoiseParams *np_apple_trees; + NoiseParams np_terrain_base; + NoiseParams np_terrain_higher; + NoiseParams np_steepness; + NoiseParams np_height_select; + NoiseParams np_mud; + NoiseParams np_beach; + NoiseParams np_biome; + NoiseParams np_cave; + NoiseParams np_humidity; + NoiseParams np_trees; + NoiseParams np_apple_trees; MapgenV6Params() { freq_desert = 0.45; freq_beach = 0.15; - np_terrain_base = &nparams_v6_def_terrain_base; - np_terrain_higher = &nparams_v6_def_terrain_higher; - np_steepness = &nparams_v6_def_steepness; - np_height_select = &nparams_v6_def_height_select; - np_mud = &nparams_v6_def_mud; - np_beach = &nparams_v6_def_beach; - np_biome = &nparams_v6_def_biome; - np_cave = &nparams_v6_def_cave; - np_humidity = &nparams_v6_def_humidity; - np_trees = &nparams_v6_def_trees; - np_apple_trees = &nparams_v6_def_apple_trees; - + np_terrain_base = nparams_v6_def_terrain_base; + np_terrain_higher = nparams_v6_def_terrain_higher; + np_steepness = nparams_v6_def_steepness; + np_height_select = nparams_v6_def_height_select; + np_mud = nparams_v6_def_mud; + np_beach = nparams_v6_def_beach; + np_biome = nparams_v6_def_biome; + np_cave = nparams_v6_def_cave; + np_humidity = nparams_v6_def_humidity; + np_trees = nparams_v6_def_trees; + np_apple_trees = nparams_v6_def_apple_trees; } + ~MapgenV6Params() {} + bool readParams(Settings *settings); void writeParams(Settings *settings); }; |