Skip to content

Commit 2e53801

Browse files
paramatnerzhul
paramat
authored and
nerzhul
committedJun 30, 2017
Mapgen: Remove unnecessary 'this->' from constructors (#6069)
·
5.11.05.0.0
1 parent 367d218 commit 2e53801

File tree

6 files changed

+63
-63
lines changed

6 files changed

+63
-63
lines changed
 

‎src/mapgen_flat.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ FlagDesc flagdesc_mapgen_flat[] = {
5151
MapgenFlat::MapgenFlat(int mapgenid, MapgenFlatParams *params, EmergeManager *emerge)
5252
: MapgenBasic(mapgenid, params, emerge)
5353
{
54-
this->spflags = params->spflags;
55-
this->ground_level = params->ground_level;
56-
this->large_cave_depth = params->large_cave_depth;
57-
this->lava_depth = params->lava_depth;
58-
this->cave_width = params->cave_width;
59-
this->lake_threshold = params->lake_threshold;
60-
this->lake_steepness = params->lake_steepness;
61-
this->hill_threshold = params->hill_threshold;
62-
this->hill_steepness = params->hill_steepness;
54+
spflags = params->spflags;
55+
ground_level = params->ground_level;
56+
large_cave_depth = params->large_cave_depth;
57+
lava_depth = params->lava_depth;
58+
cave_width = params->cave_width;
59+
lake_threshold = params->lake_threshold;
60+
lake_steepness = params->lake_steepness;
61+
hill_threshold = params->hill_threshold;
62+
hill_steepness = params->hill_steepness;
6363

6464
// 2D noise
6565
noise_filler_depth = new Noise(&params->np_filler_depth, seed, csize.X, csize.Z);

‎src/mapgen_fractal.cpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ FlagDesc flagdesc_mapgen_fractal[] = {
4949
MapgenFractal::MapgenFractal(int mapgenid, MapgenFractalParams *params, EmergeManager *emerge)
5050
: MapgenBasic(mapgenid, params, emerge)
5151
{
52-
this->spflags = params->spflags;
53-
this->cave_width = params->cave_width;
54-
this->large_cave_depth = params->large_cave_depth;
55-
this->lava_depth = params->lava_depth;
56-
this->fractal = params->fractal;
57-
this->iterations = params->iterations;
58-
this->scale = params->scale;
59-
this->offset = params->offset;
60-
this->slice_w = params->slice_w;
61-
this->julia_x = params->julia_x;
62-
this->julia_y = params->julia_y;
63-
this->julia_z = params->julia_z;
64-
this->julia_w = params->julia_w;
52+
spflags = params->spflags;
53+
cave_width = params->cave_width;
54+
large_cave_depth = params->large_cave_depth;
55+
lava_depth = params->lava_depth;
56+
fractal = params->fractal;
57+
iterations = params->iterations;
58+
scale = params->scale;
59+
offset = params->offset;
60+
slice_w = params->slice_w;
61+
julia_x = params->julia_x;
62+
julia_y = params->julia_y;
63+
julia_z = params->julia_z;
64+
julia_w = params->julia_w;
6565

6666
//// 2D terrain noise
6767
noise_seabed = new Noise(&params->np_seabed, seed, csize.X, csize.Z);
@@ -70,8 +70,8 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenFractalParams *params, EmergeMa
7070
MapgenBasic::np_cave1 = params->np_cave1;
7171
MapgenBasic::np_cave2 = params->np_cave2;
7272

73-
this->formula = fractal / 2 + fractal % 2;
74-
this->julia = fractal % 2 == 0;
73+
formula = fractal / 2 + fractal % 2;
74+
julia = fractal % 2 == 0;
7575
}
7676

7777

‎src/mapgen_v5.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ FlagDesc flagdesc_mapgen_v5[] = {
4848
MapgenV5::MapgenV5(int mapgenid, MapgenV5Params *params, EmergeManager *emerge)
4949
: MapgenBasic(mapgenid, params, emerge)
5050
{
51-
this->spflags = params->spflags;
52-
this->cave_width = params->cave_width;
53-
this->large_cave_depth = params->large_cave_depth;
54-
this->lava_depth = params->lava_depth;
55-
this->cavern_limit = params->cavern_limit;
56-
this->cavern_taper = params->cavern_taper;
57-
this->cavern_threshold = params->cavern_threshold;
51+
spflags = params->spflags;
52+
cave_width = params->cave_width;
53+
large_cave_depth = params->large_cave_depth;
54+
lava_depth = params->lava_depth;
55+
cavern_limit = params->cavern_limit;
56+
cavern_taper = params->cavern_taper;
57+
cavern_threshold = params->cavern_threshold;
5858

5959
// Terrain noise
6060
noise_filler_depth = new Noise(&params->np_filler_depth, seed, csize.X, csize.Z);

‎src/mapgen_v6.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ FlagDesc flagdesc_mapgen_v6[] = {
5858
MapgenV6::MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge)
5959
: Mapgen(mapgenid, params, emerge)
6060
{
61-
this->m_emerge = emerge;
62-
this->ystride = csize.X; //////fix this
61+
m_emerge = emerge;
62+
ystride = csize.X; //////fix this
6363

64-
this->heightmap = new s16[csize.X * csize.Z];
64+
heightmap = new s16[csize.X * csize.Z];
6565

66-
this->spflags = params->spflags;
67-
this->freq_desert = params->freq_desert;
68-
this->freq_beach = params->freq_beach;
66+
spflags = params->spflags;
67+
freq_desert = params->freq_desert;
68+
freq_beach = params->freq_beach;
6969

7070
np_cave = &params->np_cave;
7171
np_humidity = &params->np_humidity;

‎src/mapgen_v7.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,21 @@ FlagDesc flagdesc_mapgen_v7[] = {
5454
MapgenV7::MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge)
5555
: MapgenBasic(mapgenid, params, emerge)
5656
{
57-
this->spflags = params->spflags;
58-
this->cave_width = params->cave_width;
59-
this->large_cave_depth = params->large_cave_depth;
60-
this->lava_depth = params->lava_depth;
61-
this->float_mount_density = params->float_mount_density;
62-
this->floatland_level = params->floatland_level;
63-
this->shadow_limit = params->shadow_limit;
64-
this->cavern_limit = params->cavern_limit;
65-
this->cavern_taper = params->cavern_taper;
66-
this->cavern_threshold = params->cavern_threshold;
57+
spflags = params->spflags;
58+
cave_width = params->cave_width;
59+
large_cave_depth = params->large_cave_depth;
60+
lava_depth = params->lava_depth;
61+
float_mount_density = params->float_mount_density;
62+
floatland_level = params->floatland_level;
63+
shadow_limit = params->shadow_limit;
64+
cavern_limit = params->cavern_limit;
65+
cavern_taper = params->cavern_taper;
66+
cavern_threshold = params->cavern_threshold;
6767

6868
// This is to avoid a divide-by-zero.
6969
// Parameter will be saved to map_meta.txt in limited form.
7070
params->float_mount_height = MYMAX(params->float_mount_height, 1.0f);
71-
this->float_mount_height = params->float_mount_height;
71+
float_mount_height = params->float_mount_height;
7272

7373
// 2D noise
7474
noise_terrain_base = new Noise(&params->np_terrain_base, seed, csize.X, csize.Z);

‎src/mapgen_valleys.cpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,19 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenValleysParams *params, EmergeMa
6666
: MapgenBasic(mapgenid, params, emerge)
6767
{
6868
// NOTE: MapgenValleys has a hard dependency on BiomeGenOriginal
69-
this->m_bgen = (BiomeGenOriginal *)biomegen;
69+
m_bgen = (BiomeGenOriginal *)biomegen;
7070

7171
BiomeParamsOriginal *bp = (BiomeParamsOriginal *)params->bparams;
7272

73-
this->spflags = params->spflags;
74-
this->altitude_chill = params->altitude_chill;
75-
this->large_cave_depth = params->large_cave_depth;
76-
this->lava_features_lim = rangelim(params->lava_features, 0, 10);
77-
this->massive_cave_depth = params->massive_cave_depth;
78-
this->river_depth_bed = params->river_depth + 1.f;
79-
this->river_size_factor = params->river_size / 100.f;
80-
this->water_features_lim = rangelim(params->water_features, 0, 10);
81-
this->cave_width = params->cave_width;
73+
spflags = params->spflags;
74+
altitude_chill = params->altitude_chill;
75+
large_cave_depth = params->large_cave_depth;
76+
lava_features_lim = rangelim(params->lava_features, 0, 10);
77+
massive_cave_depth = params->massive_cave_depth;
78+
river_depth_bed = params->river_depth + 1.f;
79+
river_size_factor = params->river_size / 100.f;
80+
water_features_lim = rangelim(params->water_features, 0, 10);
81+
cave_width = params->cave_width;
8282

8383
//// 2D Terrain noise
8484
noise_filler_depth = new Noise(&params->np_filler_depth, seed, csize.X, csize.Z);
@@ -96,13 +96,13 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenValleysParams *params, EmergeMa
9696
noise_cave2 = new Noise(&params->np_cave2, seed, csize.X, csize.Y + 1, csize.Z);
9797
noise_massive_caves = new Noise(&params->np_massive_caves, seed, csize.X, csize.Y + 1, csize.Z);
9898

99-
this->humid_rivers = (spflags & MGVALLEYS_HUMID_RIVERS);
100-
this->use_altitude_chill = (spflags & MGVALLEYS_ALT_CHILL);
101-
this->humidity_adjust = bp->np_humidity.offset - 50.f;
99+
humid_rivers = (spflags & MGVALLEYS_HUMID_RIVERS);
100+
use_altitude_chill = (spflags & MGVALLEYS_ALT_CHILL);
101+
humidity_adjust = bp->np_humidity.offset - 50.f;
102102

103103
// a small chance of overflows if the settings are very high
104-
this->cave_water_max_height = water_level + MYMAX(0, water_features_lim - 4) * 50;
105-
this->lava_max_height = water_level + MYMAX(0, lava_features_lim - 4) * 50;
104+
cave_water_max_height = water_level + MYMAX(0, water_features_lim - 4) * 50;
105+
lava_max_height = water_level + MYMAX(0, lava_features_lim - 4) * 50;
106106

107107
tcave_cache = new float[csize.Y + 2];
108108
}

0 commit comments

Comments
 (0)
Please sign in to comment.