summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/delay.cc2
-rw-r--r--crawl-ref/source/main.cc2
-rw-r--r--crawl-ref/source/message.cc8
-rw-r--r--crawl-ref/source/message.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index c8c0da5c02..c6c323658c 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -338,7 +338,7 @@ void stop_delay( bool stop_stair_travel )
if (you.delay_queue.empty())
return;
- reset_more_autoclear();
+ set_more_autoclear(false);
ASSERT(!crawl_state.arena);
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index 347fac22f4..29ddf321e6 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -1017,7 +1017,7 @@ static void _input()
// Stop autoclearing more now that we have control back.
if (!you_are_delayed())
- reset_more_autoclear();
+ set_more_autoclear(false);
if (need_to_autopickup())
autopickup();
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc
index 440221e2b6..6fb5a692fc 100644
--- a/crawl-ref/source/message.cc
+++ b/crawl-ref/source/message.cc
@@ -846,7 +846,7 @@ static void base_mpr(const char *inf, msg_channel_type channel, int param,
Options.delay_message_clear? 2 : 1 );
if (channel == MSGCH_PROMPT || channel == MSGCH_ERROR)
- reset_more_autoclear();
+ set_more_autoclear(false);
for (unsigned i = 0; i < Options.force_more_message.size(); ++i)
{
@@ -921,7 +921,7 @@ void formatted_mpr(const formatted_string& fs, msg_channel_type channel,
mpr_store_messages(imsg, channel, param, colour);
if (channel == MSGCH_PROMPT || channel == MSGCH_ERROR)
- reset_more_autoclear();
+ set_more_autoclear(false);
if (channel == MSGCH_ERROR)
interrupt_activity( AI_FORCE_INTERRUPT );
@@ -1029,9 +1029,9 @@ void mesclr( bool force )
static bool autoclear_more = false;
-void reset_more_autoclear()
+void set_more_autoclear(bool on)
{
- autoclear_more = false;
+ autoclear_more = on;
}
void more(bool user_forced)
diff --git a/crawl-ref/source/message.h b/crawl-ref/source/message.h
index 4beb6f48e0..7e878fbc28 100644
--- a/crawl-ref/source/message.h
+++ b/crawl-ref/source/message.h
@@ -56,7 +56,7 @@ void replay_messages();
void set_colour(char set_message_colour);
-void reset_more_autoclear();
+void set_more_autoclear(bool on);
std::string get_last_messages(int mcount);