luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-12-18 04:55:20 +01:00
Code Activity

Some random code cleanups

Browse Source
This commit is contained in:
sfan5
2025-11-14 16:06:07 +01:00
parent 08ba866992
commit aff1abd05d
21 changed files with 103 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mapgen/dungeongen.h
View File

@@ -70,8 +70,8 @@ struct DungeonParams {
class DungeonGen {
public:
MMVManip *vm = nullptr;
const NodeDefManager *ndef;
GenerateNotifier *gennotify;
const NodeDefManager *ndef = nullptr;
GenerateNotifier *gennotify = nullptr;
u32 blockseed;
PseudoRandom random;

6
src/mapgen/mapgen.h
View File

@@ -86,7 +86,7 @@ private:
u32 m_notify_on = 0;
const std::set<u32> *m_notify_on_deco_ids = nullptr;
const std::set<std::string> *m_notify_on_custom = nullptr;
std::list<GenNotifyEvent> m_notify_events;
std::vector<GenNotifyEvent> m_notify_events;
StringMap m_notify_custom;
inline bool shouldNotifyOn(GenNotifyType type) const {
@@ -285,9 +285,9 @@ public:
virtual void generateDungeons(s16 max_stone_y);
protected:
BiomeManager *m_bmgr;
BiomeManager *m_bmgr = nullptr;
Noise *noise_filler_depth;
Noise *noise_filler_depth = nullptr;
v3s16 node_min;
v3s16 node_max;

22
src/mapgen/mapgen_carpathian.h
View File

@@ -77,18 +77,18 @@ private:
float river_depth;
float valley_width;
Noise *noise_height1;
Noise *noise_height2;
Noise *noise_height3;
Noise *noise_height4;
Noise *noise_hills_terrain;
Noise *noise_ridge_terrain;
Noise *noise_step_terrain;
Noise *noise_hills;
Noise *noise_ridge_mnt;
Noise *noise_step_mnt;
Noise *noise_height1 = nullptr;
Noise *noise_height2 = nullptr;
Noise *noise_height3 = nullptr;
Noise *noise_height4 = nullptr;
Noise *noise_hills_terrain = nullptr;
Noise *noise_ridge_terrain = nullptr;
Noise *noise_step_terrain = nullptr;
Noise *noise_hills = nullptr;
Noise *noise_ridge_mnt = nullptr;
Noise *noise_step_mnt = nullptr;
Noise *noise_rivers = nullptr;
Noise *noise_mnt_var;
Noise *noise_mnt_var = nullptr;
s32 grad_wl;

2
src/mapgen/mapgen_flat.h
View File

@@ -70,5 +70,5 @@ private:
float hill_threshold;
float hill_steepness;
Noise *noise_terrain;
Noise *noise_terrain = nullptr;
};

6
src/mapgen/mapgen_v5.h
View File

@@ -58,7 +58,7 @@ public:
int generateBaseTerrain();
private:
Noise *noise_factor;
Noise *noise_height;
Noise *noise_ground;
Noise *noise_factor = nullptr;
Noise *noise_height = nullptr;
Noise *noise_ground = nullptr;
};

24
src/mapgen/mapgen_v6.h
View File

@@ -78,18 +78,18 @@ public:
v3s16 full_node_max;
v3s16 central_area_size;
Noise *noise_terrain_base;
Noise *noise_terrain_higher;
Noise *noise_steepness;
Noise *noise_height_select;
Noise *noise_mud;
Noise *noise_beach;
Noise *noise_biome;
Noise *noise_humidity;
NoiseParams *np_cave;
NoiseParams *np_humidity;
NoiseParams *np_trees;
NoiseParams *np_apple_trees;
Noise *noise_terrain_base = nullptr;
Noise *noise_terrain_higher = nullptr;
Noise *noise_steepness = nullptr;
Noise *noise_height_select = nullptr;
Noise *noise_mud = nullptr;
Noise *noise_beach = nullptr;
Noise *noise_biome = nullptr;
Noise *noise_humidity = nullptr;
NoiseParams *np_cave = nullptr;
NoiseParams *np_humidity = nullptr;
NoiseParams *np_trees = nullptr;
NoiseParams *np_apple_trees = nullptr;
NoiseParams np_dungeons;

18
src/mapgen/mapgen_v7.h
View File

@@ -94,13 +94,13 @@ private:
float *float_offset_cache = nullptr;
Noise *noise_terrain_base;
Noise *noise_terrain_alt;
Noise *noise_terrain_persist;
Noise *noise_height_select;
Noise *noise_mount_height;
Noise *noise_ridge_uwater;
Noise *noise_mountain;
Noise *noise_ridge;
Noise *noise_floatland;
Noise *noise_terrain_base = nullptr;
Noise *noise_terrain_alt = nullptr;
Noise *noise_terrain_persist = nullptr;
Noise *noise_height_select = nullptr;
Noise *noise_mount_height = nullptr;
Noise *noise_ridge_uwater = nullptr;
Noise *noise_mountain = nullptr;
Noise *noise_ridge = nullptr;
Noise *noise_floatland = nullptr;
};

14
src/mapgen/mapgen_valleys.h
View File

@@ -79,18 +79,18 @@ public:
int getSpawnLevelAtPoint(v2s16 p);
private:
BiomeGenOriginal *m_bgen;
BiomeGenOriginal *m_bgen = nullptr;
float altitude_chill;
float river_depth_bed;
float river_size_factor;
Noise *noise_inter_valley_fill;
Noise *noise_inter_valley_slope;
Noise *noise_rivers;
Noise *noise_terrain_height;
Noise *noise_valley_depth;
Noise *noise_valley_profile;
Noise *noise_inter_valley_fill = nullptr;
Noise *noise_inter_valley_slope = nullptr;
Noise *noise_rivers = nullptr;
Noise *noise_terrain_height = nullptr;
Noise *noise_valley_depth = nullptr;
Noise *noise_valley_profile = nullptr;
virtual int generateTerrain();
};