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

[kirben at users.sourceforge.net]

Revision: 26827
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26827&view=rev
Author:   kirben
Date:     2007-05-13 03:07:55 -0700 (Sun, 13 May 2007)

Log Message:
-----------
Rename a few variables.

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

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2007-05-13 09:55:15 UTC (rev 26826)
+++ scummvm/trunk/engines/agos/agos.cpp	2007-05-13 10:07:55 UTC (rev 26827)
@@ -349,7 +349,7 @@
 	_timer5 = 0;
 	_timer4 = 0;
 
-	_frameRate = 0;
+	_frameCount = 0;
 
 	_zoneNumber = 0;
 
@@ -674,7 +674,7 @@
 #endif
 	_itemMemSize = 20000;
 	_tableMemSize = 200000;
-	_frameRate = 1;
+	_frameCount = 1;
 	_vgaBaseDelay = 5;
 	_numBitArray1 = 128;
 	_numItemStore = 10;
@@ -694,7 +694,7 @@
 #endif
 	_itemMemSize = 20000;
 	_tableMemSize = 200000;
-	_frameRate = 1;
+	_frameCount = 1;
 	_vgaBaseDelay = 5;
 	_numBitArray1 = 16;
 	_numBitArray2 = 16;
@@ -724,7 +724,7 @@
 	else
 		_musicIndexBase = 1128 / 4;
 	_soundIndexBase = 1660 / 4;
-	_frameRate = 1;
+	_frameCount = 1;
 	_vgaBaseDelay = 1;
 	_numBitArray1 = 16;
 	_numBitArray2 = 16;
@@ -749,7 +749,7 @@
 	_tableMemSize = 50000;
 	_musicIndexBase = 1316 / 4;
 	_soundIndexBase = 0;
-	_frameRate = 1;
+	_frameCount = 1;
 	_vgaBaseDelay = 1;
 	_numBitArray1 = 16;
 	_numBitArray2 = 16;
@@ -770,7 +770,7 @@
 #endif
 	_itemMemSize = 80000;
 	_tableMemSize = 50000;
-	_frameRate = 4;
+	_frameCount = 4;
 	_vgaBaseDelay = 1;
 	_numBitArray1 = 16;
 	_numBitArray2 = 15;
@@ -791,7 +791,7 @@
 #endif
 	_itemMemSize = 64000;
 	_tableMemSize = 100000;
-	_frameRate = 4;
+	_frameCount = 4;
 	_vgaBaseDelay = 1;
 	_numBitArray1 = 16;
 	_numBitArray2 = 15;
@@ -811,7 +811,7 @@
 #endif
 	_itemMemSize = 64000;
 	_tableMemSize = 256000;
-	_frameRate = 4;
+	_frameCount = 4;
 	_vgaBaseDelay = 1;
 	_numVars = 512;
 
@@ -940,8 +940,8 @@
 	vc34_setMouseOff();
 
 	if (getGameType() != GType_PP && getGameType() != GType_FF) {
-		uint16 delay = (getGameType() == GType_SIMON2) ? 5 : _frameRate;
-		addVgaEvent(delay, NULL, 0, 0, 2);
+		uint16 count = (getGameType() == GType_SIMON2) ? 5 : _frameCount;
+		addVgaEvent(count, NULL, 0, 0, 2);
 	}
 
 	if (getGameType() == GType_ELVIRA1 && getPlatform() == Common::kPlatformAtariST &&

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2007-05-13 09:55:15 UTC (rev 26826)
+++ scummvm/trunk/engines/agos/agos.h	2007-05-13 10:07:55 UTC (rev 26827)
@@ -421,7 +421,7 @@
 
 	uint16 _syncCount, _timer5, _timer4;
 
-	uint16 _frameRate;
+	uint16 _frameCount;
 
 	uint16 _zoneNumber;
 	uint16 _vgaWaitFor, _lastVgaWaitFor;

Modified: scummvm/trunk/engines/agos/event.cpp
===================================================================
--- scummvm/trunk/engines/agos/event.cpp	2007-05-13 09:55:15 UTC (rev 26826)
+++ scummvm/trunk/engines/agos/event.cpp	2007-05-13 10:07:55 UTC (rev 26827)
@@ -236,7 +236,7 @@
 			uint8 type = vte->type;
 
 			if (type == 2) {
-				vte->delay = (getGameType() == GType_SIMON2) ? 5 : _frameRate;
+				vte->delay = (getGameType() == GType_SIMON2) ? 5 : _frameCount;
 
 				animateSprites();
 

Modified: scummvm/trunk/engines/agos/vga.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga.cpp	2007-05-13 09:55:15 UTC (rev 26826)
+++ scummvm/trunk/engines/agos/vga.cpp	2007-05-13 10:07:55 UTC (rev 26827)
@@ -713,9 +713,9 @@
 	if (getGameType() == GType_FF || getGameType() == GType_PP) {
 		num = vcReadNextByte();
 	} else if (getGameType() == GType_SIMON2) {
-		num = vcReadNextByte() * _frameRate;
+		num = vcReadNextByte() * _frameCount;
 	} else {
-		num = vcReadVarOrWord() * _frameRate;
+		num = vcReadVarOrWord() * _frameCount;
 	}
 
 	num += _vgaBaseDelay;
@@ -1105,7 +1105,7 @@
 }
 
 void AGOSEngine::vc30_setFrameRate() {
-	_frameRate = vcReadNextWord();
+	_frameCount = vcReadNextWord();
 }
 
 void AGOSEngine::vc31_setWindow() {
@@ -1346,7 +1346,7 @@
 	uint16 val = vcReadVar(vcReadNextWord());
 	if (val != vcReadNextWord()) {
 
-		addVgaEvent(_frameRate + 1, _vcPtr - 4, _vgaCurSpriteId, _vgaCurZoneNum);
+		addVgaEvent(_frameCount + 1, _vcPtr - 4, _vgaCurSpriteId, _vgaCurZoneNum);
 		_vcPtr = (byte *)&_vc_get_out_of_code;
 	}
 }

Modified: scummvm/trunk/engines/agos/vga_s2.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga_s2.cpp	2007-05-13 09:55:15 UTC (rev 26826)
+++ scummvm/trunk/engines/agos/vga_s2.cpp	2007-05-13 10:07:55 UTC (rev 26827)
@@ -48,7 +48,7 @@
 }
 
 void AGOSEngine::vc56_delayLong() {
-	uint16 num = vcReadVarOrWord() * _frameRate;
+	uint16 num = vcReadVarOrWord() * _frameCount;
 
 	addVgaEvent(num + _vgaBaseDelay, _vcPtr, _vgaCurSpriteId, _vgaCurZoneNum);
 	_vcPtr = (byte *)&_vc_get_out_of_code;


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