diff options
| author | DShaligram <DShaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-08-15 22:01:46 +0000 |
|---|---|---|
| committer | DShaligram <DShaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-08-15 22:01:46 +0000 |
| commit | 8f126891d8dda651dd68f1da691abefc471b27c5 (patch) | |
| tree | 6c93757b83d2eb8da7ddd17fd0c5154ec9b8d213 | |
| parent | 03945879dafaf9f02c365ad1a800308b78f095aa (diff) | |
| download | crawl-ref-8f126891d8dda651dd68f1da691abefc471b27c5.tar.gz crawl-ref-8f126891d8dda651dd68f1da691abefc471b27c5.zip | |
r32@calamity: dshaligram | 2006-08-15 23:29:32 +051800
Removed #ifdefs for USE_SILENCE - Silence is well-established now, there's no
need to keep it conditional.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@19 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/AppHdr.h | 3 | ||||
| -rw-r--r-- | crawl-ref/source/stuff.cc | 10 |
2 files changed, 0 insertions, 13 deletions
diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h index 44c115b80a..e9b38ff160 100644 --- a/crawl-ref/source/AppHdr.h +++ b/crawl-ref/source/AppHdr.h @@ -271,9 +271,6 @@ //jmf: New defines for a bunch of optional features. // ================================================= -------------------------- -// New silence code -- seems to actually work! Use it! -#define USE_SILENCE_CODE - // Use special colours for various channels of messages #define USE_COLOUR_MESSAGES diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index facdeacc47..72e919f8f7 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -705,8 +705,6 @@ bool adjacent( int x, int y, int x2, int y2 ) bool silenced(char x, char y) { -#ifdef USE_SILENCE_CODE - if (you.duration[DUR_SILENCE] > 0 && distance(x, y, you.x_pos, you.y_pos) <= 36) // (6 * 6) { @@ -722,19 +720,11 @@ bool silenced(char x, char y) // } return false; } - -#else - return false; -#endif } // end silenced() bool player_can_hear(char x, char y) { -#ifdef USE_SILENCE_CODE return (!silenced(x, y) && !silenced(you.x_pos, you.y_pos)); -#else - return true; -#endif } // end player_can_hear() unsigned char random_colour(void) |