summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/acr.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-25 13:49:52 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-25 13:49:52 +0000
commit4c56ab40290b29a37eefb46230e987ed6028ce4f (patch)
treec8def6cbd1815dc55cd132c99c98ed99ce9d20ac /crawl-ref/source/acr.cc
parentbdb45bf27b86ff63c5afdff311b4065c83faf37d (diff)
downloadcrawl-ref-4c56ab40290b29a37eefb46230e987ed6028ce4f.tar.gz
crawl-ref-4c56ab40290b29a37eefb46230e987ed6028ce4f.zip
Applied whereis patch from crawl.akrasiac.org (tracks where the player is in
the dungeon). All dgamelaunch patches are conditionalised by DGL_foo #ifdefs. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1096 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
-rw-r--r--crawl-ref/source/acr.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 5987d4d0d0..6f5d1ddccc 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -166,7 +166,7 @@ static command_type get_next_cmd();
static keycode_type get_next_keycode();
static command_type keycode_to_command( keycode_type key );
-#ifdef SIMPLE_MESSAGING
+#ifdef DGL_SIMPLE_MESSAGING
static void read_messages();
#endif
@@ -984,7 +984,7 @@ static void go_downstairs()
return;
}
-#ifdef MILESTONES
+#ifdef DGL_MILESTONES
// Not entirely accurate - the player could die before reaching the Abyss.
if (grd[you.x_pos][you.y_pos] == DNGN_ENTER_ABYSS)
mark_milestone("abyss.enter", "entered the Abyss!");
@@ -1122,7 +1122,7 @@ void process_command( command_type cmd )
break;
case CMD_READ_MESSAGES:
-#ifdef SIMPLE_MESSAGING
+#ifdef DGL_SIMPLE_MESSAGING
if (SysEnv.have_messages)
read_messages();
#endif
@@ -2368,7 +2368,7 @@ static void world_reacts()
return;
}
-#ifdef SIMPLE_MESSAGING
+#ifdef DGL_SIMPLE_MESSAGING
static struct stat mfilestat;
@@ -2475,7 +2475,7 @@ static void check_messages()
|| SysEnv.have_messages
|| SysEnv.messagefile.empty()
|| kbhit()
- || (SysEnv.message_check_tick++ % MESSAGE_CHECK_INTERVAL))
+ || (SysEnv.message_check_tick++ % DGL_MESSAGE_CHECK_INTERVAL))
{
return;
}
@@ -2505,7 +2505,7 @@ static void check_messages()
static command_type get_next_cmd()
{
-#ifdef SIMPLE_MESSAGING
+#ifdef DGL_SIMPLE_MESSAGING
check_messages();
#endif