diff options
| author | Enne Walker <ennewalker@users.sourceforge.net> | 2009-11-29 14:02:32 -0500 |
|---|---|---|
| committer | Enne Walker <ennewalker@users.sourceforge.net> | 2009-11-29 14:02:32 -0500 |
| commit | 645e79be66446b7fc6622ee4abbcc84f88dab94b (patch) | |
| tree | 4136972264462f3dfbc6191ff912238aa8df0009 | |
| parent | fa6e376242d7e7de95ff8419b226286b650fe304 (diff) | |
| download | crawl-ref-645e79be66446b7fc6622ee4abbcc84f88dab94b.tar.gz crawl-ref-645e79be66446b7fc6622ee4abbcc84f88dab94b.zip | |
Add missing NON_ITEM check for tiles.
| -rw-r--r-- | crawl-ref/source/show.cc | 11 | ||||
| -rw-r--r-- | crawl-ref/source/tilepick.cc | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/crawl-ref/source/show.cc b/crawl-ref/source/show.cc index 628e41baed..784eac2994 100644 --- a/crawl-ref/source/show.cc +++ b/crawl-ref/source/show.cc @@ -250,10 +250,13 @@ void show_def::_update_item_at(const coord_def &gp, const coord_def &ep) #ifdef USE_TILE int idx = igrd(gp); - if (feat_is_stair(feat)) - tile_place_item_marker(ep.x, ep.y, idx); - else - tile_place_item(ep.x, ep.y, idx); + if (idx != NON_ITEM) + { + if (feat_is_stair(feat)) + tile_place_item_marker(ep.x, ep.y, idx); + else + tile_place_item(ep.x, ep.y, idx); + } #endif } diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index d919805693..0d40354652 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -4556,6 +4556,8 @@ void tile_floor_halo(dungeon_feature_type target, int tile) // Called from item() in view.cc void tile_place_item(int x, int y, int idx) { + ASSERT(idx != NON_ITEM); + int t = tileidx_item(mitm[idx]); if (mitm[idx].link != NON_ITEM) t |= TILE_FLAG_S_UNDER; @@ -4569,6 +4571,8 @@ void tile_place_item(int x, int y, int idx) // Called from item() in view.cc void tile_place_item_marker(int x, int y, int idx) { + ASSERT(idx != NON_ITEM); + env.tile_fg[x][y] |= TILE_FLAG_S_UNDER; if (item_needs_autopickup(mitm[idx])) |