diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-07 09:31:20 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-07 09:31:20 +0000 |
| commit | 0465fe0800f27cb9df0f7dd32f3decb3b20f9edb (patch) | |
| tree | 1135021f3a975d630da28351f5b80c3dab806cef /crawl-ref/source | |
| parent | 19cd11e35e3481c93e39c8ed8072c338d0bb4344 (diff) | |
| download | crawl-ref-0465fe0800f27cb9df0f7dd32f3decb3b20f9edb.tar.gz crawl-ref-0465fe0800f27cb9df0f7dd32f3decb3b20f9edb.zip | |
[1695733] Fixed buggy cloud crashes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1250 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/defines.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/direct.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/tags.cc | 2 |
3 files changed, 3 insertions, 4 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/tags.cc b/crawl-ref/source/tags.cc index deebe42670..b7d6d79fd5 100644 --- a/crawl-ref/source/tags.cc +++ b/crawl-ref/source/tags.cc @@ -1529,7 +1529,7 @@ 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); } } |