From c983e879e11a38d98f038a43943f92e93fdc58b1 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Fri, 1 Jun 2007 23:12:22 +0000
Subject: Fix regressions, caused by VGATimerEntry type changes.

svn-id: r27044
---
 engines/agos/gfx.cpp    | 12 ++++++------
 engines/agos/script.cpp |  2 +-
 engines/agos/vga.cpp    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'engines/agos')

diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp
index 6486cc8ca7..241c1928ff 100644
--- a/engines/agos/gfx.cpp
+++ b/engines/agos/gfx.cpp
@@ -1255,14 +1255,14 @@ void AGOSEngine::setWindowImage(uint16 mode, uint16 vga_res_id) {
 	_windowNum = updateWindow = mode;
 	_lockWord |= 0x20;
 
-	VgaTimerEntry *vte = _vgaTimerList;
-	while (vte->type != 2)
-		vte++;
-
-	vte->delay = 2;
-
 	if (getGameType() == GType_FF || getGameType() == GType_PP) {
 		vc27_resetSprite();
+	} else {
+		VgaTimerEntry *vte = _vgaTimerList;
+		while (vte->type != ANIMATE_INT)
+			vte++;
+
+		vte->delay = 2;
 	}
 
 	if (getGameType() == GType_SIMON2 || getGameType() == GType_FF) {
diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp
index 8a4457faf2..d3197f6d90 100644
--- a/engines/agos/script.cpp
+++ b/engines/agos/script.cpp
@@ -453,7 +453,7 @@ void AGOSEngine::o_haltAnimation() {
 	if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) {
 		VgaTimerEntry *vte = _vgaTimerList;
 		while (vte->delay) {
-			if (vte->type == 0)
+			if (vte->type == ANIMATE_EVENT)
 				vte->delay += 10;
 			vte++;
 		}
diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp
index 1d2c280246..47f327fb74 100644
--- a/engines/agos/vga.cpp
+++ b/engines/agos/vga.cpp
@@ -1042,7 +1042,7 @@ void AGOSEngine::vc27_resetSprite() {
 	vte = _vgaTimerList;
 	while (vte->delay) {
 		// Skip the animateSprites event in earlier games
-		if (vte->type == 2) {
+		if (vte->type == ANIMATE_INT) {
 			vte++;
 		// For animated heart in Elvira 2
 		} else if (getGameType() == GType_ELVIRA2 && vte->sprite_id == 100) {
-- 
cgit v1.2.3