diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-07 09:47:27 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-07 09:47:27 +0000 |
| commit | 39499a899f021a4f43cad61b1e4a7920b7d52d85 (patch) | |
| tree | 7056ecc57cdffe8bbe2b0c0675d79ee0d5c8f00d | |
| parent | d4bb9564654ccce58057dfa182bbb4bc1811db7b (diff) | |
| parent | 19a176d9f092f4f271652b348cafa0e7ebc578d2 (diff) | |
| download | crawl-ref-0.2.3.tar.gz crawl-ref-0.2.3.zip | |
Re-tagging 0.2.3, hopefully for the last time.0.2.3
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/tags/stone_soup-0.2.3@1254 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/defines.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/direct.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/files.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/tags.cc | 6 |
4 files changed, 8 insertions, 5 deletions
diff --git a/crawl-ref/source/defines.h b/crawl-ref/source/defines.h index f4a55736ef..cca786c9d0 100644 --- a/crawl-ref/source/defines.h +++ b/crawl-ref/source/defines.h @@ -68,7 +68,7 @@ #define MAX_CLOUDS 180 // empty cloud -- (CLOUDS + 1) {dlb}: -#define EMPTY_CLOUD 101 +#define EMPTY_CLOUD (MAX_CLOUDS + 1) // max x-bound for level generation {dlb} #define GXM 80 diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc index b260f14dc7..1f745b1a78 100644 --- a/crawl-ref/source/direct.cc +++ b/crawl-ref/source/direct.cc @@ -1554,8 +1554,7 @@ static void describe_cell(int mx, int my) #endif if (env.cgrid[mx][my] != EMPTY_CLOUD) { - const char cloud_inspected = env.cgrid[mx][my]; - + const int cloud_inspected = env.cgrid[mx][my]; const cloud_type ctype = (cloud_type) env.cloud[cloud_inspected].type; mprf("There is a cloud of %s here.", cloud_name(ctype).c_str()); diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index df241e835c..07b4676347 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -89,7 +89,7 @@ void save_level(int level_saved, bool was_a_labyrinth, char where_were_you); #define GHOST_MINOR_VERSION 1 -#define LEVEL_MINOR_VERSION 1 +#define LEVEL_MINOR_VERSION 2 #define YOU_MINOR_VERSION 1 static void redraw_all(void) diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc index deebe42670..68fa56440e 100644 --- a/crawl-ref/source/tags.cc +++ b/crawl-ref/source/tags.cc @@ -1529,7 +1529,11 @@ static void tag_read_level( struct tagHeader &th, char minorVersion ) env.map_col[i][j].flags = unmarshallShort(th); mgrd[i][j] = NON_MONSTER; - env.cgrid[i][j] = unmarshallByte(th); + env.cgrid[i][j] = (unsigned char) unmarshallByte(th); + + // Ugh! Backward compatibility. 101 was the old (buggy) EMPTY_CLOUD + if (minorVersion < 2 && env.cgrid[i][j] == 101) + env.cgrid[i][j] = EMPTY_CLOUD; } } |