diff options
29 files changed, 42 insertions, 8 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 140c36deff..cb8c2fbd6c 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -50,6 +50,7 @@ #include "spells4.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "transfor.h" #include "tutorial.h" diff --git a/crawl-ref/source/areas.cc b/crawl-ref/source/areas.cc index 31be349598..43dc1e4b97 100644 --- a/crawl-ref/source/areas.cc +++ b/crawl-ref/source/areas.cc @@ -27,6 +27,9 @@ #include "travel.h" #include "viewgeom.h" +/////////////// +// Sanctuary + static void _remove_sanctuary_property(const coord_def& where) { env.pgrid(where) &= ~(FPROP_SANCTUARY_1 | FPROP_SANCTUARY_2); @@ -241,3 +244,14 @@ void create_sanctuary(const coord_def& center, int time) else if (scare_count > 0) mpr("The monsters scatter in all directions!"); } + + +///////////// +// Silence + +bool silenced(const coord_def& p) +{ + // FIXME: implement for monsters + return (you.duration[DUR_SILENCE] && distance(p, you.pos()) <= 6*6 + 1); +} + diff --git a/crawl-ref/source/areas.h b/crawl-ref/source/areas.h index 04ca393a6d..a2da7eebb0 100644 --- a/crawl-ref/source/areas.h +++ b/crawl-ref/source/areas.h @@ -5,5 +5,7 @@ void create_sanctuary(const coord_def& center, int time); bool remove_sanctuary(bool did_attack = false); void decrease_sanctuary_radius(); +bool silenced(const coord_def& p); + #endif diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc index f6698604ef..fad60e22ef 100644 --- a/crawl-ref/source/artefact.cc +++ b/crawl-ref/source/artefact.cc @@ -17,6 +17,7 @@ #include "externs.h" #include "options.h" +#include "areas.h" #include "colour.h" #include "coordit.h" #include "database.h" diff --git a/crawl-ref/source/behold.cc b/crawl-ref/source/behold.cc index 0f9356c778..e38b80607c 100644 --- a/crawl-ref/source/behold.cc +++ b/crawl-ref/source/behold.cc @@ -16,6 +16,7 @@ #include "random.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "view.h" // Add a monster to the list of beholders. diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 3ff8e04cb6..a1e9ccf2c0 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -51,6 +51,7 @@ #include "showsymb.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "stash.h" #ifdef USE_TILE #include "tiles.h" diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc index b759932301..ebeb80a435 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -43,6 +43,7 @@ #include "spl-cast.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "view.h" #include "shout.h" #include "xom.h" diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 9771cebf07..c69c63a7f2 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -67,6 +67,7 @@ #include "spl-util.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "teleport.h" #include "transfor.h" #include "traps.h" diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 4947554b00..7e4c8a8eb6 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -56,6 +56,7 @@ #include "spl-util.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "stash.h" #include "state.h" #include "terrain.h" diff --git a/crawl-ref/source/l_you.cc b/crawl-ref/source/l_you.cc index 1848e06749..c68d9903ef 100644 --- a/crawl-ref/source/l_you.cc +++ b/crawl-ref/source/l_you.cc @@ -22,6 +22,7 @@ #include "spells3.h" #include "spl-util.h" #include "stuff.h" +#include "areas.h" #include "transfor.h" #include "travel.h" diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc index 05e8e77fab..5a93dece02 100644 --- a/crawl-ref/source/message.cc +++ b/crawl-ref/source/message.cc @@ -30,6 +30,7 @@ #include "stash.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "tags.h" #include "travel.h" #include "tutorial.h" diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index b5182b278b..3f0ded4a1c 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -72,6 +72,7 @@ #include "stash.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "tiles.h" #include "terrain.h" #include "transfor.h" diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index bf1ed3af9e..01127e3b18 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -30,6 +30,7 @@ #include "spl-util.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "view.h" #include "shout.h" #include "viewchar.h" diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc index 587fafdff8..2e9a6b0a84 100644 --- a/crawl-ref/source/mon-act.cc +++ b/crawl-ref/source/mon-act.cc @@ -7,6 +7,7 @@ #include "AppHdr.h" #include "mon-act.h" +#include "areas.h" #include "arena.h" #include "attitude-change.h" #include "beam.h" diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc index a476da9e73..30bc323ef5 100644 --- a/crawl-ref/source/mon-cast.cc +++ b/crawl-ref/source/mon-cast.cc @@ -31,6 +31,7 @@ #include "spells3.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "teleport.h" #include "view.h" #include "viewchar.h" diff --git a/crawl-ref/source/mon-speak.cc b/crawl-ref/source/mon-speak.cc index 3a2232cfe1..6d17ec3e11 100644 --- a/crawl-ref/source/mon-speak.cc +++ b/crawl-ref/source/mon-speak.cc @@ -26,6 +26,7 @@ #include "religion.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "view.h" // Try the exact key lookup along with the entire prefix list. diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc index 4bc9c03d4a..86403941cb 100644 --- a/crawl-ref/source/mon-stuff.cc +++ b/crawl-ref/source/mon-stuff.cc @@ -42,6 +42,7 @@ #include "spl-util.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "terrain.h" #include "transfor.h" #include "traps.h" diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 2b2545a611..73ba895c38 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -58,6 +58,7 @@ #include "spl-util.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "terrain.h" #include "transfor.h" #include "traps.h" diff --git a/crawl-ref/source/shout.cc b/crawl-ref/source/shout.cc index 84fc52a2c1..e4167278ba 100644 --- a/crawl-ref/source/shout.cc +++ b/crawl-ref/source/shout.cc @@ -26,6 +26,7 @@ #include "skills.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "tutorial.h" #include "view.h" diff --git a/crawl-ref/source/show.cc b/crawl-ref/source/show.cc index 7694fd8c0f..99839781d6 100644 --- a/crawl-ref/source/show.cc +++ b/crawl-ref/source/show.cc @@ -18,6 +18,7 @@ #include "showsymb.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "terrain.h" #include "viewgeom.h" #include "viewmap.h" diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index a4270b035b..49d51e12b9 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -47,6 +47,7 @@ #include "spl-util.h" #include "stash.h" #include "stuff.h" +#include "areas.h" #include "traps.h" #include "travel.h" #include "view.h" diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index f2f0af6053..dbde499551 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -47,6 +47,7 @@ #include "spl-mis.h" #include "spl-util.h" #include "stuff.h" +#include "areas.h" #include "teleport.h" #include "terrain.h" #include "transfor.h" diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index c60ead6174..b2ed7ad242 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -52,6 +52,7 @@ #include "spl-util.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "transfor.h" #include "tutorial.h" #include "view.h" diff --git a/crawl-ref/source/spl-mis.cc b/crawl-ref/source/spl-mis.cc index 8666fa8fa1..b67dea7d86 100644 --- a/crawl-ref/source/spl-mis.cc +++ b/crawl-ref/source/spl-mis.cc @@ -28,6 +28,7 @@ #include "spells1.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "terrain.h" #include "transfor.h" #include "view.h" diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index 3737cebf2d..f7f93c67a7 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -17,6 +17,7 @@ #include "mon-place.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "view.h" #include "viewchar.h" #include "viewgeom.h" @@ -808,12 +809,6 @@ int yesnoquit( const char* str, bool safe, int safeanswer, bool allow_all, } } -bool silenced(const coord_def& p) -{ - // FIXME: implement for monsters - return (you.duration[DUR_SILENCE] && distance(p, you.pos()) <= 6*6 + 1); -} - bool player_can_hear(const coord_def& p) { return (!silenced(p) && !silenced(you.pos())); diff --git a/crawl-ref/source/stuff.h b/crawl-ref/source/stuff.h index 976bb8fddb..11fea7beed 100644 --- a/crawl-ref/source/stuff.h +++ b/crawl-ref/source/stuff.h @@ -71,8 +71,6 @@ int yesnoquit( const char* str, bool safe = true, int safeanswer = 0, bool allow_all = false, bool clear_after = true, char alt_yes = 'Y', char alt_yes2 = 'Y' ); -bool silenced(const coord_def& p); - bool player_can_hear(const coord_def& p); char index_to_letter (int the_index); diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 25124e4af5..e20d9ae233 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -35,6 +35,7 @@ #include "spl-util.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "terrain.h" #include "transfor.h" #include "tutorial.h" diff --git a/crawl-ref/source/wiz-mon.cc b/crawl-ref/source/wiz-mon.cc index 1f5e1b928a..f85c5eeef6 100644 --- a/crawl-ref/source/wiz-mon.cc +++ b/crawl-ref/source/wiz-mon.cc @@ -33,6 +33,7 @@ #include "spl-mis.h" #include "spl-util.h" #include "stuff.h" +#include "areas.h" #include "view.h" #ifdef WIZARD diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index c0d5df800d..fe2fd7f6e4 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -50,6 +50,7 @@ #include "stash.h" #include "state.h" #include "stuff.h" +#include "areas.h" #include "teleport.h" #include "terrain.h" #include "transfor.h" |