diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-29 01:31:50 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-29 01:31:50 +0000 |
| commit | a0fe746d9733dec01dc27f120042b76ed1c658f6 (patch) | |
| tree | 6d9c2b5de0630929a0a5bd24d03e43964d127670 | |
| parent | 6bf5bb925649736d9d313011523bdb429c225970 (diff) | |
| download | crawl-ref-a0fe746d9733dec01dc27f120042b76ed1c658f6.tar.gz crawl-ref-a0fe746d9733dec01dc27f120042b76ed1c658f6.zip | |
Revert an accidental change of Matthew's PlaceInfo fix. Sorry about
that! (And yes, I had to get up again when I remembered that I'd forgotten
to commit this fix. *yawns*)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6711 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/docs/changes.stone_soup | 3 | ||||
| -rw-r--r-- | crawl-ref/source/externs.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup index f18fafd955..ebd2babecc 100644 --- a/crawl-ref/docs/changes.stone_soup +++ b/crawl-ref/docs/changes.stone_soup @@ -12,6 +12,7 @@ Disclaimer: These are merely the highlights, not an exhaustive list of changes. * Fixed picking up runes not enabling teleport control. * Fixed macros not working with 0.3.4 keymaps by introducing keybinding. * Fixed x_ and other feature hotkeys not working in the Abyss. +* Fixed firing at enslaved monsters being impossible. * Fixed items being created in walls. * Fixed randart bardings masquerading as boots. * Fixed not swapping with a fiery monster into a fire cloud still moving it. @@ -30,9 +31,11 @@ Disclaimer: These are merely the highlights, not an exhaustive list of changes. * Abominations created by Twisted Resurrection count as undead again. * Restrict freezing cloud to high-damage cold beams, reduce their duration. * Reduce number of times a beam can bounce. +* Don't autoswitch to randarts with the curse property as a butchering tool. * Count chunks and blood towards decks of summoning rather than wonder. * Show monsters sensing/seeing invisible in their 'x' description. * Self-hit prompts now respect the player's known resistances. +* 'allow_self_target = no' no longer prevents self-targetting for area spells. * Added chunk colour to lua eating prompt. * Added PCRE to the source tree. diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index 66c056c8a6..fdd48acfbb 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -530,7 +530,9 @@ public: bool is_global() const; void make_global(); - void assert_validity() const; + // Not const since it now tries to patch up problems instead of + // merely asserting. + void assert_validity(); const std::string short_name() const; diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 5ff5f3fa21..781ea5e7fb 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -6765,7 +6765,7 @@ void PlaceInfo::make_global() branch = -1; } -void PlaceInfo::assert_validity() const +void PlaceInfo::assert_validity() { // Check that level_type and branch match up. ASSERT(is_global() |