diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 21:30:33 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 21:30:33 +0000 |
| commit | 80f31bee412fa01db4611cdd27862db6a34d419c (patch) | |
| tree | 1f032864acceb947e4d50df291d8ebafe22c6324 /crawl-ref/source/tile1.cc | |
| parent | c42e7efab8779a54b7e3e486ae83f4af72b15fb9 (diff) | |
| download | crawl-ref-80f31bee412fa01db4611cdd27862db6a34d419c.tar.gz crawl-ref-80f31bee412fa01db4611cdd27862db6a34d419c.zip | |
Fix another two instances of monster placement returning false
instead of -1.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6155 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tile1.cc')
| -rw-r--r-- | crawl-ref/source/tile1.cc | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc index 2f0c3f9aae..ed2c3bf65a 100644 --- a/crawl-ref/source/tile1.cc +++ b/crawl-ref/source/tile1.cc @@ -2354,18 +2354,20 @@ static void _finalize_tile(unsigned int *tile, bool is_special, // Hack: Swap rock/stone in crypt and tomb, because there are // only stone walls. if ((you.where_are_you == BRANCH_CRYPT || you.where_are_you == BRANCH_TOMB) - && orig == TILE_DNGN_STONE_WALL) - orig = TILE_DNGN_ROCK_WALL_OFS; + && orig == TILE_DNGN_STONE_WALL) + { + orig = TILE_DNGN_ROCK_WALL_OFS; + } // If there are special tiles for this level, then use them. // Otherwise, we'll fall through to the next case and replace // special tiles with normal floor. - if (orig == TILE_DNGN_FLOOR && is_special && - get_num_floor_special_flavors() > 0) + if (orig == TILE_DNGN_FLOOR && is_special + && get_num_floor_special_flavors() > 0) { (*tile) = get_floor_special_tile_idx() + special_flv; - ASSERT(special_flv >= 0 && - special_flv < get_num_floor_special_flavors()); + ASSERT(special_flv >= 0 + && special_flv < get_num_floor_special_flavors()); } else if (orig == TILE_DNGN_FLOOR || orig == TILE_DNGN_FLOOR_SPECIAL) { @@ -2375,10 +2377,10 @@ static void _finalize_tile(unsigned int *tile, bool is_special, { (*tile) = get_wall_tile_idx() + wall_flv; } - else if (orig == TILE_DNGN_SHALLOW_WATER || - orig == TILE_DNGN_DEEP_WATER || - orig == TILE_DNGN_LAVA || - orig == TILE_DNGN_STONE_WALL) + else if (orig == TILE_DNGN_SHALLOW_WATER + || orig == TILE_DNGN_DEEP_WATER + || orig == TILE_DNGN_LAVA + || orig == TILE_DNGN_STONE_WALL) { // These types always have four flavors... (*tile) = orig + (floor_flv % 4); @@ -2861,14 +2863,14 @@ void tilep_job_default(int job, int gender, int *parts) } /* - * Patrs index to string + * Parts index to string */ void tilep_part_to_str(int number, char *buf) { //special if (number == TILEP_SHOW_EQUIP) { - buf[0] = buf[1] = buf[2] ='*'; + buf[0] = buf[1] = buf[2] = '*'; } else { |