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

[kirben at users.sourceforge.net]

Revision: 24111
          http://svn.sourceforge.net/scummvm/?rev=24111&view=rev
Author:   kirben
Date:     2006-10-04 05:29:37 -0700 (Wed, 04 Oct 2006)

Log Message:
-----------
Correct frame rate in earlier games

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

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2006-10-04 11:44:59 UTC (rev 24110)
+++ scummvm/trunk/engines/agos/agos.cpp	2006-10-04 12:29:37 UTC (rev 24111)
@@ -549,6 +549,7 @@
 		_vgaMemSize = gVars->memory[kMemSimon2Games];
 #endif
 		_tableMemSize = 200000;
+		_frameRate = 1;
 		_vgaBaseDelay = 5;
 		_numVars = 2048;
 	} else if (getGameType() == GType_FF) {
@@ -561,6 +562,7 @@
 		_vgaMemSize = gVars->memory[kMemSimon2Games];
 #endif
 		_tableMemSize = 200000;
+		_frameRate = 1;
 		_vgaBaseDelay = 5;
 		_numVars = 255;
 	} else if (getGameType() == GType_SIMON2) {
@@ -581,6 +583,7 @@
 		else
 			_musicIndexBase = 1128 / 4;
 		_soundIndexBase = 1660 / 4;
+		_frameRate = 1;
 		_vgaBaseDelay = 1;
 		_numVars = 255;
 	} else if (getGameType() == GType_SIMON1) {
@@ -597,6 +600,7 @@
 		_tableMemSize = 150000;
 		_musicIndexBase = 1316 / 4;
 		_soundIndexBase = 0;
+		_frameRate = 1;
 		_vgaBaseDelay = 1;
 		_numVars = 255;
 	} else if (getGameType() == GType_WW) {
@@ -609,6 +613,7 @@
 		_vgaMemSize = gVars->memory[kMemSimon1Games];
 #endif
 		_tableMemSize = 150000;
+		_frameRate = 4;
 		_vgaBaseDelay = 1;
 		_numVars = 255;
 	} else if (getGameType() == GType_ELVIRA2) {
@@ -621,6 +626,7 @@
 		_vgaMemSize = gVars->memory[kMemSimon1Games];
 #endif
 		_tableMemSize = 50000;
+		_frameRate = 4;
 		_vgaBaseDelay = 1;
 		_numVars = 255;
 	} else if (getGameType() == GType_ELVIRA) {
@@ -633,6 +639,7 @@
 		_vgaMemSize = gVars->memory[kMemSimon1Games];
 #endif
 		_tableMemSize = 150000;
+		_frameRate = 4;
 		_vgaBaseDelay = 1;
 		_numVars = 512;
 	}
@@ -653,8 +660,6 @@
 	_currentMouseCursor = 255;
 	_currentMouseAnim = 255;
 
-	_frameRate = 1;
-
 	_lastMusicPlayed = -1;
 	_nextMusicToPlay = -1;
 

Modified: scummvm/trunk/engines/agos/vga.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga.cpp	2006-10-04 11:44:59 UTC (rev 24110)
+++ scummvm/trunk/engines/agos/vga.cpp	2006-10-04 12:29:37 UTC (rev 24111)
@@ -1629,7 +1629,7 @@
 	} else if (getGameType() == GType_SIMON2) {
 		num = vcReadNextByte() * _frameRate;
 	} else {
-		num = vcReadVarOrWord();
+		num = vcReadVarOrWord() * _frameRate;
 	}
 
 	// Work around to allow inventory arrows to be


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