diff options
| -rw-r--r-- | crawl-ref/source/dungeon.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/items.cc | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 5218753987..2c69791907 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -6791,7 +6791,9 @@ static void build_river( dungeon_feature_type river_type ) //mv // So we'll avoid the silliness of orcs/royal jelly on // lava and deep water grids. -- bwr if (!one_chance_in(200) - // && grd[i][j] == DNGN_FLOOR + && (grd[i][j] < DNGN_ENTER_SHOP + || grd[i][j] > DNGN_EXIT_PORTAL_VAULT) + && grd[i][j] != DNGN_EXIT_HELL // just to be safe && mgrd[i][j] == NON_MONSTER && igrd[i][j] == NON_ITEM) { @@ -6855,7 +6857,9 @@ static void build_lake(dungeon_feature_type lake_type) //mv // So we'll avoid the silliness of monsters and items // on lava and deep water grids. -- bwr if (!one_chance_in(200) - // && grd[i][j] == DNGN_FLOOR + && (grd[i][j] < DNGN_ENTER_SHOP + || grd[i][j] > DNGN_EXIT_PORTAL_VAULT) + && grd[i][j] != DNGN_EXIT_HELL // just to be safe && mgrd[i][j] == NON_MONSTER && igrd[i][j] == NON_ITEM) { diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 3f71d29434..812a42632d 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -1890,7 +1890,7 @@ void update_corpses(double elapsedTime) continue; } - if (rot_time >= it.special) + if (rot_time >= it.special && !is_being_butchered(it)) { if (it.base_type == OBJ_FOOD) { |