zmv7
/
MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some minor cleanups from the last commit

master
kwolekr 2013-03-16 22:34:12 -04:00
parent 165498cecf
commit 67228160ae
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mapgen_indev.cpp
View File

@ -191,6 +191,7 @@ float MapgenIndev::baseTerrainLevelFromNoise(v2s16 p) {
steepness, height_select); steepness, height_select);
} }
float MapgenIndev::baseTerrainLevelFromMap(int index) { float MapgenIndev::baseTerrainLevelFromMap(int index) {
if (flags & MG_FLAT) if (flags & MG_FLAT)
return water_level; return water_level;
@ -204,6 +205,7 @@ float MapgenIndev::baseTerrainLevelFromMap(int index) {
steepness, height_select); steepness, height_select);
} }
float MapgenIndev::getMudAmount(int index) float MapgenIndev::getMudAmount(int index)
{ {
if (flags & MG_FLAT) if (flags & MG_FLAT)
@ -216,6 +218,7 @@ float MapgenIndev::getMudAmount(int index)
return noiseindev_mud->result[index]; return noiseindev_mud->result[index];
} }
void MapgenIndev::defineCave(Cave & cave, PseudoRandom ps, v3s16 node_min, bool large_cave) { void MapgenIndev::defineCave(Cave & cave, PseudoRandom ps, v3s16 node_min, bool large_cave) {
cave.min_tunnel_diameter = 2; cave.min_tunnel_diameter = 2;
cave.max_tunnel_diameter = ps.range(2,6); cave.max_tunnel_diameter = ps.range(2,6);
@ -243,4 +246,4 @@ void MapgenIndev::defineCave(Cave & cave, PseudoRandom ps, v3s16 node_min, bool
cave.tunnel_routepoints = ps.range(10, ps.range(15,30)); cave.tunnel_routepoints = ps.range(10, ps.range(15,30));
} }
cave.large_cave_is_flat = (ps.range(0,1) == 0); cave.large_cave_is_flat = (ps.range(0,1) == 0);
}; }

10
src/mapgen_v6.cpp
View File

@ -878,13 +878,12 @@ void MapgenV6::growGrass() {
} }
} }
void MapgenV6::defineCave(Cave & cave, PseudoRandom ps, v3s16 node_min, bool large_cave) { void MapgenV6::defineCave(Cave &cave, PseudoRandom ps,
v3s16 node_min, bool large_cave) {
cave.min_tunnel_diameter = 2; cave.min_tunnel_diameter = 2;
cave.max_tunnel_diameter = ps.range(2,6); cave.max_tunnel_diameter = ps.range(2,6);
cave.dswitchint = ps.range(1,14); cave.dswitchint = ps.range(1,14);
//cave.tunnel_routepoints = 0; cave.flooded = true; //large_cave && ps.range(0,4);
//cave.part_max_length_rs = 0;
cave.flooded = large_cave && ps.range(0,4);
if(large_cave){ if(large_cave){
cave.part_max_length_rs = ps.range(2,4); cave.part_max_length_rs = ps.range(2,4);
cave.tunnel_routepoints = ps.range(5, ps.range(15,30)); cave.tunnel_routepoints = ps.range(5, ps.range(15,30));
@ -895,7 +894,8 @@ void MapgenV6::defineCave(Cave & cave, PseudoRandom ps, v3s16 node_min, bool lar
cave.tunnel_routepoints = ps.range(10, ps.range(15,30)); cave.tunnel_routepoints = ps.range(10, ps.range(15,30));
} }
cave.large_cave_is_flat = (ps.range(0,1) == 0); cave.large_cave_is_flat = (ps.range(0,1) == 0);
}; }
void MapgenV6::generateCaves(int max_stone_y) { void MapgenV6::generateCaves(int max_stone_y) {
// 24ms @cs=8 // 24ms @cs=8

4
src/mapgen_v6.h
View File

@ -157,7 +157,6 @@ public:
u32 get_blockseed(u64 seed, v3s16 p); u32 get_blockseed(u64 seed, v3s16 p);
virtual void calculateNoise(); virtual void calculateNoise();
int generateGround(); int generateGround();
void addMud(); void addMud();
@ -165,7 +164,8 @@ public:
void addDirtGravelBlobs(); void addDirtGravelBlobs();
void growGrass(); void growGrass();
void placeTrees(); void placeTrees();
virtual void defineCave(Cave & cave, PseudoRandom ps, v3s16 node_min, bool large_cave); virtual void defineCave(Cave &cave, PseudoRandom ps,
v3s16 node_min, bool large_cave);
void generateCaves(int max_stone_y); void generateCaves(int max_stone_y);
}; };

1
src/noise.cpp
View File

@ -524,7 +524,6 @@ float *Noise::perlinMap2D(float x, float y) {
for (j = 0; j != sy; j++) { for (j = 0; j != sy; j++) {
for (i = 0; i != sx; i++) { for (i = 0; i != sx; i++) {
result[index] += g * buf[index]; result[index] += g * buf[index];
//dstream << "pm2d i="<<index<<" r="<< result[index]<<std::endl;
index++; index++;
} }
} }