projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use pause_fps_max also on multiplayer
[oweals/minetest.git]
/
src
/
mapgen_v6.cpp
diff --git
a/src/mapgen_v6.cpp
b/src/mapgen_v6.cpp
index 92ae7dff0cca7a8884a3a812746deb503202d606..a212496a8bca679144bf4fc392c1363c057d4836 100644
(file)
--- a/
src/mapgen_v6.cpp
+++ b/
src/mapgen_v6.cpp
@@
-38,10
+38,10
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#include "mapgen_v6.h"
FlagDesc flagdesc_mapgen_v6[] = {
#include "mapgen_v6.h"
FlagDesc flagdesc_mapgen_v6[] = {
- {"
v6_jungles",
MGV6_JUNGLES},
- {"
v6_biome_blend", MGV6_BIOME_
BLEND},
- {"
v6_nomudflow", MGV6_NO
MUDFLOW},
- {NULL,
0}
+ {"
jungles",
MGV6_JUNGLES},
+ {"
biomeblend", MGV6_BIOME
BLEND},
+ {"
mudflow", MGV6_
MUDFLOW},
+ {NULL, 0}
};
///////////////////////////////////////////////////////////////////////////////
};
///////////////////////////////////////////////////////////////////////////////
@@
-93,7
+93,7
@@
MapgenV6::~MapgenV6() {
MapgenV6Params::MapgenV6Params() {
MapgenV6Params::MapgenV6Params() {
- spflags = MGV6_BIOME
_BLEND
;
+ spflags = MGV6_BIOME
BLEND | MGV6_MUDFLOW
;
freq_desert = 0.45;
freq_beach = 0.15;
freq_desert = 0.45;
freq_beach = 0.15;
@@
-131,7
+131,7
@@
void MapgenV6Params::readParams(Settings *settings) {
void MapgenV6Params::writeParams(Settings *settings) {
void MapgenV6Params::writeParams(Settings *settings) {
- settings->setFlagStr("mgv6_spflags", spflags, flagdesc_mapgen_v6);
+ settings->setFlagStr("mgv6_spflags", spflags, flagdesc_mapgen_v6
, (u32)-1
);
settings->setFloat("mgv6_freq_desert", freq_desert);
settings->setFloat("mgv6_freq_beach", freq_beach);
settings->setFloat("mgv6_freq_desert", freq_desert);
settings->setFloat("mgv6_freq_beach", freq_beach);
@@
-365,7
+365,7
@@
BiomeType MapgenV6::getBiome(int index, v2s16 p)
if (d > freq_desert)
return BT_DESERT;
if (d > freq_desert)
return BT_DESERT;
- if ((spflags & MGV6_BIOME
_
BLEND) &&
+ if ((spflags & MGV6_BIOMEBLEND) &&
(d > freq_desert - 0.10) &&
((noise2d(p.X, p.Y, seed) + 1.0) > (freq_desert - d) * 20.0))
return BT_DESERT;
(d > freq_desert - 0.10) &&
((noise2d(p.X, p.Y, seed) + 1.0) > (freq_desert - d) * 20.0))
return BT_DESERT;
@@
-481,7
+481,7
@@
void MapgenV6::makeChunk(BlockMakeData *data) {
addDirtGravelBlobs();
// Flow mud away from steep edges
addDirtGravelBlobs();
// Flow mud away from steep edges
- if (
!(spflags & MGV6_NOMUDFLOW)
)
+ if (
spflags & MGV6_MUDFLOW
)
flowMud(mudflow_minpos, mudflow_maxpos);
}
flowMud(mudflow_minpos, mudflow_maxpos);
}
@@
-543,7
+543,7
@@
void MapgenV6::makeChunk(BlockMakeData *data) {
}
// Calculate lighting
}
// Calculate lighting
- if (
!(flags & MG_NOLIGHT)
)
+ if (
flags & MG_LIGHT
)
calcLighting(node_min - v3s16(1, 1, 1) * MAP_BLOCKSIZE,
node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE);
calcLighting(node_min - v3s16(1, 1, 1) * MAP_BLOCKSIZE,
node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE);