diff options
| author | paramat <mat.gregory@virginmedia.com> | 2016-07-29 03:44:58 +0100 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2016-08-04 06:58:42 +0100 |
| commit | ea12da939fdb0a8fd13de885d104af3031ffc3ac (patch) | |
| tree | 5ceba6e5172e51859d2c0191f69784d2a5631af3 /src/mapgen.h | |
| parent | fca8e53842718f7f23e11587ae6235c072892b97 (diff) | |
| download | minetest-ea12da939fdb0a8fd13de885d104af3031ffc3ac.tar.gz minetest-ea12da939fdb0a8fd13de885d104af3031ffc3ac.tar.bz2 minetest-ea12da939fdb0a8fd13de885d104af3031ffc3ac.zip | |
Mapgen: Remove unused 'flat' and 'trees' flags from mg_flags
When the 'flat' and 'trees' flags were moved into mgv6_spflags they
were left in mg_flags in an attempt to support old mgv6 worlds. However
their appearence in mg_flags causes confusion, also, later, old-world
support was found to be broken for mgv6 worlds with 'notrees'.
This commit cleans up the mess and comes a month after a thread warning
of the change, and explaining the required action, was posted in the
news subforum. Only old mgv6 worlds with 'flat' or 'notrees' are
affected, a small minority of worlds, the required action being
correctly setting these flags in mgv6_spflags.
Disable a section of the 'map settings manager' unit test which is to
be changed as it is causing problems for pull requests.
Diffstat (limited to 'src/mapgen.h')
| -rw-r--r-- | src/mapgen.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mapgen.h b/src/mapgen.h index 5fcf2a365..403fb7470 100644 --- a/src/mapgen.h +++ b/src/mapgen.h @@ -30,10 +30,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #define MAPGEN_DEFAULT_NAME "v6" /////////////////// Mapgen flags -#define MG_TREES 0x01 +#define MG_TREES 0x01 // Deprecated. Moved into mgv6 flags #define MG_CAVES 0x02 #define MG_DUNGEONS 0x04 -#define MG_FLAT 0x08 +#define MG_FLAT 0x08 // Deprecated. Moved into mgv6 flags #define MG_LIGHT 0x10 #define MG_DECORATIONS 0x20 |