From 633be17e7fcdadc45d33b9f8a2430e82e3c8a569 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 8 May 2007 22:35:21 +0000
Subject: Fixed bug #1715284: Roger sometimes disappears

svn-id: r26790
---
 engines/agi/view.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines/agi')

diff --git a/engines/agi/view.cpp b/engines/agi/view.cpp
index 80140c91f3..808f227f6e 100644
--- a/engines/agi/view.cpp
+++ b/engines/agi/view.cpp
@@ -281,8 +281,11 @@ void AgiEngine::setView(VtEntry *v, int n) {
 	// When setting a view to the view table, if there's already another view set in that
 	// view table entry and it's still drawn, erase the existing view before setting the new one
 	// Fixes bug #1658643: AGI: SQ1 (2.2 DOS ENG) Graphic error, ego leaves behind copy
+	// Update: Apparently, this makes ego dissapear at times, e.g. when textboxes are shown
+	// Therefore, it's limited to view 118 in SQ1 (Roger climbing the ladder)
+	// Fixes bug #1715284: Roger sometimes disappears
 	if (v->viewData != NULL) {
-		if (v->currentView != n && v->flags & DRAWN) {
+		if (v->currentView == 118 && v->flags & DRAWN && getGameID() == GID_SQ1) {
 			viewFlags = v->flags;			// Store the flags for the view
 			_sprites->eraseUpdSprites();
 			if (v->flags & UPDATE) {
-- 
cgit v1.2.3