via bb8e66c71e39a0d1688fc67c3224c8a139583854 (commit)
via 026dfa39b433ae0b960fca200db94956c20e5e60 (commit)
via d6d1cbfb79dbf5b33c163b79a87c12d22a44df5a (commit)
via 2c821d9b7b5933b17c6e1090b5b9cd10bcf3bd7a (commit)
via 4a345d3ac92e8abffb72ad2021ce9359616af823 (commit)
from 1908ecb5c82ae25502487210c9f033351a74d746 (commit)
-----------------------------------------------------------------------
commit bb8e66c71e39a0d1688fc67c3224c8a139583854
Author: Raphael Langella <raphael.lange...@gmail.com>
Date: Fri Feb 18 00:28:39 2011 +0100
Fix silent spells making noise in crypt.
commit 026dfa39b433ae0b960fca200db94956c20e5e60
Author: Raphael Langella <raphael.lange...@gmail.com>
Date: Fri Feb 18 00:02:34 2011 +0100
whitespaces
commit d6d1cbfb79dbf5b33c163b79a87c12d22a44df5a
Author: Raphael Langella <raphael.lange...@gmail.com>
Date: Thu Feb 17 23:54:26 2011 +0100
Don't prevent blink from putting you in dangerous clouds.
It can put you in the middle of monsters so there's no reason why it's so
nice with clouds. And it prevents players from using clouds to control the
direction of their blink, or to fill a corridor with a cloud and blink away.
commit 2c821d9b7b5933b17c6e1090b5b9cd10bcf3bd7a
Author: Raphael Langella <raphael.lange...@gmail.com>
Date: Thu Feb 17 23:39:47 2011 +0100
Fix the paralysis death message placement.
commit 4a345d3ac92e8abffb72ad2021ce9359616af823
Author: Raphael Langella <raphael.lange...@gmail.com>
Date: Thu Feb 17 21:53:56 2011 +0100
Fix tornado casting message when cast in flying form.
Replaced is_levitating() by airborne()
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/beam.cc | 2 +-
crawl-ref/source/food.h | 4 ++--
crawl-ref/source/hiscores.cc | 7 ++++---
crawl-ref/source/spl-cast.cc | 2 +-
crawl-ref/source/spl-tornado.cc | 2 +-
crawl-ref/source/teleport.h | 2 +-
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index c97c1f4..295a047 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -2306,7 +2306,7 @@ void bolt::affect_endpoint()
if (is_tracer)
return;
- if (!is_explosion && !noise_generated)
+ if (!is_explosion && !noise_generated && loudness)
{
noisy(loudness, pos(), beam_source);
noise_generated = true;
diff --git a/crawl-ref/source/food.h b/crawl-ref/source/food.h
index d101f45..93f4053 100644
--- a/crawl-ref/source/food.h
+++ b/crawl-ref/source/food.h
@@ -60,10 +60,10 @@ bool is_preferred_food(const item_def &food);
bool is_forbidden_food(const item_def &food);
bool check_amu_the_gourmand(bool reqid);
-bool can_ingest(const item_def &food, bool suppress_msg,
+bool can_ingest(const item_def &food, bool suppress_msg,
bool reqid = false, bool check_hunger = true);
bool can_ingest(int what_isit, int kindof_thing, bool suppress_msg,
- bool reqid = false, bool check_hunger = true,
+ bool reqid = false, bool check_hunger = true,
bool rotten = false);
bool chunk_is_poisonous(int chunktype);
diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc
index f63f171..dd80da6 100644
--- a/crawl-ref/source/hiscores.cc
+++ b/crawl-ref/source/hiscores.cc
@@ -2067,9 +2067,6 @@ std::string
scorefile_entry::death_description(death_desc_verbosity verbosity)
done_damage = true;
}
- if (you.duration[DUR_PARALYSIS])
- desc += "\n ... while paralysed";
-
if (death_type == KILLED_BY_LEAVING
|| death_type == KILLED_BY_WINNING)
{
@@ -2175,6 +2172,10 @@ std::string
scorefile_entry::death_description(death_desc_verbosity verbosity)
if (needs_damage)
desc += _hiscore_newline_string();
+
+ if (you.duration[DUR_PARALYSIS])
+ desc += "... while paralysed" + _hiscore_newline_string();
+
}
}
}
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 5658e0b..2f7772f 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1167,7 +1167,7 @@ spret_type your_spells(spell_type spell, int powc,
const int loudness = spell_noise(spell);
// Make some noise if it's actually the player casting.
- if (god == GOD_NO_GOD)
+ if (god == GOD_NO_GOD && loudness)
noisy(loudness, you.pos());
if (allow_fail)
diff --git a/crawl-ref/source/spl-tornado.cc b/crawl-ref/source/spl-tornado.cc
index fa976f4..e846bb0 100644
--- a/crawl-ref/source/spl-tornado.cc
+++ b/crawl-ref/source/spl-tornado.cc
@@ -136,7 +136,7 @@ bool cast_tornado(int powc)
}
mprf("A great vortex of raging winds %s.",
- you.is_levitating() ? "appears around you"
+ you.airborne() ? "appears around you"
: "appears and lifts you up");
if (you.fishtail)
diff --git a/crawl-ref/source/teleport.h b/crawl-ref/source/teleport.h
index e68022c..9c28520 100644
--- a/crawl-ref/source/teleport.h
+++ b/crawl-ref/source/teleport.h
@@ -11,7 +11,7 @@ void blink_close(monster* mon);
bool random_near_space(const coord_def& origin, coord_def& target,
bool allow_adjacent = false, bool restrict_LOS = true,
- bool forbid_dangerous = true,
+ bool forbid_dangerous = false,
bool forbid_sanctuary = false);
#endif
--
Dungeon Crawl Stone Soup
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Crawl-ref-discuss mailing list
Crawl-ref-discuss@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/crawl-ref-discuss
