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_v7.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_v7.h')
| -rw-r--r-- | src/mapgen_v7.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h index 3391098ea..b6b03689d 100644 --- a/src/mapgen_v7.h +++ b/src/mapgen_v7.h @@ -30,22 +30,24 @@ extern NoiseParams nparams_v7_def_height_select; extern NoiseParams nparams_v7_def_ridge; struct MapgenV7Params : public MapgenParams { - NoiseParams *np_terrain_base; - NoiseParams *np_terrain_alt; - NoiseParams *np_terrain_mod; - NoiseParams *np_terrain_persist; - NoiseParams *np_height_select; - NoiseParams *np_ridge; + NoiseParams np_terrain_base; + NoiseParams np_terrain_alt; + NoiseParams np_terrain_mod; + NoiseParams np_terrain_persist; + NoiseParams np_height_select; + NoiseParams np_ridge; MapgenV7Params() { - np_terrain_base = &nparams_v7_def_terrain_base; - np_terrain_alt = &nparams_v7_def_terrain_alt; - np_terrain_mod = &nparams_v7_def_terrain_mod; - np_terrain_persist = &nparams_v7_def_terrain_persist; - np_height_select = &nparams_v7_def_height_select; - np_ridge = &nparams_v7_def_ridge; + np_terrain_base = nparams_v7_def_terrain_base; + np_terrain_alt = nparams_v7_def_terrain_alt; + np_terrain_mod = nparams_v7_def_terrain_mod; + np_terrain_persist = nparams_v7_def_terrain_persist; + np_height_select = nparams_v7_def_height_select; + np_ridge = nparams_v7_def_ridge; } + ~MapgenV7Params() {} + bool readParams(Settings *settings); void writeParams(Settings *settings); }; |