fiddlerwoaroof/crawl - Change SYTQFVPZKDRTGKBV7SQFULQKY4V7NBBCEBQF2KF5LZEP2VVYNUFQC

Fix 1708493: corpses being butchered turning into skeletons,

yet not, and leaving clean chunks. Strange stuff!

I also added a restriction to build_river() and build_lake() so that staircases or branch entries/exits don't drown. This might still result in stairs in the midst of a lake but that is vastly better than no stairs at all, as probably happened with 1787377. Now I don't know whether this was even played a part in that occurence, but I didn't find anything else in dungeon.cc that might have caused it.

And YAY, I'm a member!

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2060 c06c8d41-db1a-0410-9941-cceddc491573

Created by j-p-e-g on September 6, 2007

SYTQFVPZKDRTGKBV7SQFULQKY4V7NBBCEBQF2KF5LZEP2VVYNUFQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/items.cc at line 1893 [3.2584728]
B:BD[3.2627883] → [2.681:717]
```
        if (rot_time >= it.special)
```
[3.2627883]
[3.2627924]
```
        if (rot_time >= it.special && !is_being_butchered(it))
```

Replacement in crawl-ref/source/dungeon.cc at line 6794 [3.3429798]

B:BD[3.3694475] → [3.3694475:3694525]

                    // && grd[i][j] == DNGN_FLOOR

[3.3694475]

[3.3694525]

                    && (grd[i][j] < DNGN_ENTER_SHOP
			|| grd[i][j] > DNGN_EXIT_PORTAL_VAULT)
		    && grd[i][j] != DNGN_EXIT_HELL // just to be safe

Replacement in crawl-ref/source/dungeon.cc at line 6860 [3.3429798]

B:BD[3.3696362] → [3.3696362:3696412]

                    // && grd[i][j] == DNGN_FLOOR

[3.3696362]

[3.3696412]

                    && (grd[i][j] < DNGN_ENTER_SHOP
			|| grd[i][j] > DNGN_EXIT_PORTAL_VAULT)
		    && grd[i][j] != DNGN_EXIT_HELL // just to be safe