From ab03e17cb1730b6b7a1d77ce6ec715d549f21881 Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Thu, 15 Jan 2015 15:11:39 -0500
Subject: [PATCH] Fix some display update issues

---
 src/boe.combat.cpp         | 6 +-----
 src/boe.graphics.cpp       | 2 ++
 src/boe.main.cpp           | 4 ----
 src/boe.party.cpp          | 1 -
 src/scenedit/scen.main.cpp | 1 -
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/boe.combat.cpp b/src/boe.combat.cpp
index fe9746c8..94be6600 100644
--- a/src/boe.combat.cpp
+++ b/src/boe.combat.cpp
@@ -2410,9 +2410,7 @@ void monster_attack_pc(short who_att,short target) {
 								break;
 						}
 						if(snd > 0) play_sound(snd);
-						print_buf();
 						monst_basic_abil(who_att, abil, target);
-						put_pc_screen();
 					}
 				}
 			}
@@ -2420,7 +2418,7 @@ void monster_attack_pc(short who_att,short target) {
 				add_string_to_buf("  Misses.");
 				play_sound(2);
 			}
-			mainPtr.display();
+			redraw_screen(REFRESH_STATS | REFRESH_TERRAIN | REFRESH_TRANS);
 			sf::sleep(time_in_ticks(2));
 			combat_posing_monster = -1;
 			draw_terrain(2);
@@ -3109,7 +3107,6 @@ bool monst_cast_mage(cCreature *caster,short targ) {
 						break;
 					j = get_ran(1,2,3);
 				}
-				mainPtr.display(); // TODO: Needed?
 				sf::sleep(time_in_ticks(12)); // gives sound time to end
 				x = get_ran(4,1,4);
 				for(i = 0; i < j; i++){
@@ -3190,7 +3187,6 @@ bool monst_cast_mage(cCreature *caster,short targ) {
 				x = get_ran(3,1,4);
 				play_sound(25);
 				play_sound(-61);
-				mainPtr.display(); // TODO: Needed?
 				sf::sleep(time_in_ticks(12)); // gives sound time to end
 				summon_monster(85,caster->cur_loc,
 							   ((caster->attitude % 2 != 1) ? 0 : 100) + x,caster->attitude);
diff --git a/src/boe.graphics.cpp b/src/boe.graphics.cpp
index b2a0be56..dc25e45c 100644
--- a/src/boe.graphics.cpp
+++ b/src/boe.graphics.cpp
@@ -601,6 +601,7 @@ void redraw_screen(int refresh) {
 		item_sbar->draw();
 		shop_sbar->draw();
 	}
+	mainPtr.display();
 }
 
 void put_background() {
@@ -1508,6 +1509,7 @@ void boom_space(location where,short mode,short type,short damage,short sound) {
 		if(fast_bang == 1)
 			fast_bang = 2;
 	}
+	refresh_stat_areas(0);
 	
 	where_draw.x = where.x - center.x + 4;
 	where_draw.y = where.y - center.y + 4;
diff --git a/src/boe.main.cpp b/src/boe.main.cpp
index af7c8fc5..f6404db5 100644
--- a/src/boe.main.cpp
+++ b/src/boe.main.cpp
@@ -223,7 +223,6 @@ void Handle_One_Event() {
 		}
 		flushingInput = false;
 		redraw_screen(REFRESH_NONE);
-		mainPtr.display();
 		return;
 	}
 	switch(event.type) {
@@ -287,7 +286,6 @@ void Handle_One_Event() {
 			break; // There's several events we don't need to handle at all
 	}
 	flushingInput = false; // TODO: Could there be a case when the key and mouse input that needs to be flushed has other events interspersed?
-	mainPtr.display(); // TODO: I'm assuming this needs to be SOMEWHERE, at least.
 }
 
 
@@ -303,7 +301,6 @@ static void handleUpdateWhileScrolling(volatile bool& doneScrolling, int refresh
 	while(!doneScrolling) {
 		sf::sleep(sf::milliseconds(10));
 		redraw_screen(refresh);
-		mainPtr.display();
 	}
 }
 
@@ -707,7 +704,6 @@ void pause(short length) {
 	
 	// Before pausing, make sure the screen is updated.
 	redraw_screen(REFRESH_NONE);
-	mainPtr.display();
 	
 	if(give_delays)
 		sf::sleep(time_in_ticks(len));
diff --git a/src/boe.party.cpp b/src/boe.party.cpp
index ae642302..827f9e2f 100644
--- a/src/boe.party.cpp
+++ b/src/boe.party.cpp
@@ -263,7 +263,6 @@ void put_party_in_scen(std::string scen_name) {
 	update_explored(univ.scenario.where_start);
 	overall_mode = MODE_TOWN;
 	redraw_screen(REFRESH_ALL);
-	mainPtr.display(); // TODO: Maybe display() should be called in redraw_screen()?
 	set_stat_window(0);
 	adjust_spell_menus();
 	adjust_monst_menu();
diff --git a/src/scenedit/scen.main.cpp b/src/scenedit/scen.main.cpp
index 8ed0e94f..9ebddbbe 100644
--- a/src/scenedit/scen.main.cpp
+++ b/src/scenedit/scen.main.cpp
@@ -493,7 +493,6 @@ static void handleUpdateWhileScrolling(volatile bool& doneScrolling) {
 		sf::sleep(sf::milliseconds(10));
 		// TODO: redraw_screen should probably take the argument specifying what to update
 		redraw_screen(/*REFRESH_RIGHT_BAR*/);
-		mainPtr.display();
 	}
 }