[Hide Content]From 6e3e6817aa777faeb6fefeb02a1002bc34d6a046 Mon Sep 17 00:00:00 2001
From: BlackSheep <chris.terenzi@gmail.com>
Date: Wed, 28 Aug 2013 12:58:31 -0400
Subject: [PATCH] Make eating, drinking from fountains and donating at an altar
interrupt recite
---
crawl-ref/source/food.cc | 3 +++
crawl-ref/source/godprayer.cc | 1 +
crawl-ref/source/item_use.cc | 1 +
3 files changed, 5 insertions(+)
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index ba31891..756bfbb 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -46,6 +46,7 @@
#include "random.h"
#include "religion.h"
#include "godconduct.h"
+#include "godabil.h"
#include "skills2.h"
#include "spl-util.h"
#include "state.h"
@@ -1960,6 +1961,7 @@ static void _eat_chunk(item_def& food)
if (do_eat)
{
dprf("nutrition: %d", nutrition);
+ zin_recite_interrupt();
start_delay(DELAY_EAT, food_turns(food) - 1,
(suppress_msg) ? 0 : nutrition, -1);
lessen_hunger(nutrition, true);
@@ -1976,6 +1978,7 @@ static void _eating(item_def& food)
duration = 0; // to eat multiple things per turn
// use delay.parm3 to figure out whether to output "finish eating"
+ zin_recite_interrupt();
start_delay(DELAY_EAT, duration, 0, food.base_type == OBJ_FOOD ?
food.sub_type : -2, duration);
diff --git a/crawl-ref/source/godprayer.cc b/crawl-ref/source/godprayer.cc
index c2fcd57..c62ed02 100644
--- a/crawl-ref/source/godprayer.cc
+++ b/crawl-ref/source/godprayer.cc
@@ -486,6 +486,7 @@ static bool _zin_donate_gold()
mpr(result.c_str());
}
+ zin_recite_interrupt();
return true;
}
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index c6a508c..f3c8e76 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2328,6 +2328,7 @@ static bool _drink_fountain()
crawl_state.cancel_cmd_repeat();
}
+ zin_recite_interrupt();
you.turn_is_over = true;
return true;
}
--
1.8.1.2