[Scummvm-cvs-logs] SF.net SVN: scummvm: [24052] scummvm/trunk/engines/agos

[kirben at users.sourceforge.net]

Revision: 24052
          http://svn.sourceforge.net/scummvm/?rev=24052&view=rev
Author:   kirben
Date:     2006-10-01 03:48:06 -0700 (Sun, 01 Oct 2006)

Log Message:
-----------
Update vga timer code to match original PP

Modified Paths:
--------------
    scummvm/trunk/engines/agos/event.cpp
    scummvm/trunk/engines/agos/vga.cpp

Modified: scummvm/trunk/engines/agos/event.cpp
===================================================================
--- scummvm/trunk/engines/agos/event.cpp	2006-10-01 10:07:57 UTC (rev 24051)
+++ scummvm/trunk/engines/agos/event.cpp	2006-10-01 10:48:06 UTC (rev 24052)
@@ -199,12 +199,11 @@
 
 void AGOSEngine::processVgaEvents() {
 	VgaTimerEntry *vte = _vgaTimerList;
-	uint timer = (getGameType() == GType_FF) ? 5 : 1;
 
 	_vgaTickCounter++;
 
 	while (vte->delay) {
-		vte->delay -= timer;
+		vte->delay -= _vgaBaseDelay;
 		if (vte->delay <= 0) {
 			uint16 curZoneNum = vte->cur_vga_file;
 			uint16 cur_sprite = vte->sprite_id;
@@ -214,7 +213,8 @@
 			_nextVgaTimerToProcess = vte + 1;
 			deleteVgaEvent(vte);
 
-			if (getGameType() == GType_FF && script_ptr == NULL) {
+			if ((getGameType() == GType_FF || getGameType() == GType_PP) &&
+				script_ptr == NULL) {
 				panEvent(curZoneNum, cur_sprite, param);
 			} else if (getGameType() == GType_SIMON2 && script_ptr == NULL) {
 				scrollEvent();
@@ -338,7 +338,6 @@
 					}
 				}
 			} else {
-				processVgaEvents();
 				if (_scrollCount == 0) {
 					_lockWord &= ~2;
 					return;
@@ -384,7 +383,7 @@
 	}
 
 	if (_copyPartialMode == 2) {
-		if (getGameType() == GType_FF) {
+		if (getGameType() == GType_FF || getGameType() == GType_PP) {
 			fillFrontFromBack(0, 0, _screenWidth, _screenHeight);
 		} else {
 			fillFrontFromBack(176, 61, _screenWidth - 176, 134 - 61);

Modified: scummvm/trunk/engines/agos/vga.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga.cpp	2006-10-01 10:07:57 UTC (rev 24051)
+++ scummvm/trunk/engines/agos/vga.cpp	2006-10-01 10:48:06 UTC (rev 24052)
@@ -2418,14 +2418,11 @@
 void AGOSEngine::vc63_fastFadeIn() {
 	if (getGameType() == GType_PP) {
 		_fastFadeInFlag = 256;
-
 		if (getBitFlag(100)) {
 			printf("StartOverlayAnims\n");
-		}
-		if (getBitFlag(103)) {
+		} else if (getBitFlag(103)) {
 			printf("NameAndTime\n");
-		}
-		if (getBitFlag(104)) {
+		} else if (getBitFlag(104)) {
 			printf("HiScoreTable\n");
 		}
 	} else if (getGameType() == GType_FF) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.