Allow timed specials and similar stuff to trigger while resting

2014-12-12 10:29:29 -05:00
parent 2c2f824f4c
commit 24781b335d
7 changed files with 93 additions and 30 deletions
--- a/osx/boe.dlgutil.cpp
+++ b/osx/boe.dlgutil.cpp
@@ -732,9 +732,7 @@ void handle_talk_event(location p)
 				talk_end_forced = true;
 				univ.party.gold -= a;
 				put_pc_screen();
-				heal_party(30 * b);
-				restore_sp_party(25 * b);
-				univ.party.age += 700;
+				do_rest(700, 30 & b, 25 * b);
 				univ.town.p_loc.x = c;
 				univ.town.p_loc.y = d;
 				center = univ.town.p_loc;