Rename a few variables.

svn-id: r26827

5 files changed, 17 insertions, 17 deletions

diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 420fe8a4b6..d48503c443 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -349,7 +349,7 @@ AGOSEngine::AGOSEngine(OSystem *syst)
 	_timer5 = 0;
 	_timer4 = 0;
 
-	_frameRate = 0;
+	_frameCount = 0;
 
 	_zoneNumber = 0;
 
@@ -674,7 +674,7 @@ void AGOSEngine_PuzzlePack::setupGame() {
 #endif
 	_itemMemSize = 20000;
 	_tableMemSize = 200000;
-	_frameRate = 1;
+	_frameCount = 1;
 	_vgaBaseDelay = 5;
 	_numBitArray1 = 128;
 	_numItemStore = 10;
@@ -694,7 +694,7 @@ void AGOSEngine_Feeble::setupGame() {
 #endif
 	_itemMemSize = 20000;
 	_tableMemSize = 200000;
-	_frameRate = 1;
+	_frameCount = 1;
 	_vgaBaseDelay = 5;
 	_numBitArray1 = 16;
 	_numBitArray2 = 16;
@@ -724,7 +724,7 @@ void AGOSEngine_Simon2::setupGame() {
 	else
 		_musicIndexBase = 1128 / 4;
 	_soundIndexBase = 1660 / 4;
-	_frameRate = 1;
+	_frameCount = 1;
 	_vgaBaseDelay = 1;
 	_numBitArray1 = 16;
 	_numBitArray2 = 16;
@@ -749,7 +749,7 @@ void AGOSEngine_Simon1::setupGame() {
 	_tableMemSize = 50000;
 	_musicIndexBase = 1316 / 4;
 	_soundIndexBase = 0;
-	_frameRate = 1;
+	_frameCount = 1;
 	_vgaBaseDelay = 1;
 	_numBitArray1 = 16;
 	_numBitArray2 = 16;
@@ -770,7 +770,7 @@ void AGOSEngine_Waxworks::setupGame() {
 #endif
 	_itemMemSize = 80000;
 	_tableMemSize = 50000;
-	_frameRate = 4;
+	_frameCount = 4;
 	_vgaBaseDelay = 1;
 	_numBitArray1 = 16;
 	_numBitArray2 = 15;
@@ -791,7 +791,7 @@ void AGOSEngine_Elvira2::setupGame() {
 #endif
 	_itemMemSize = 64000;
 	_tableMemSize = 100000;
-	_frameRate = 4;
+	_frameCount = 4;
 	_vgaBaseDelay = 1;
 	_numBitArray1 = 16;
 	_numBitArray2 = 15;
@@ -811,7 +811,7 @@ void AGOSEngine_Elvira1::setupGame() {
 #endif
 	_itemMemSize = 64000;
 	_tableMemSize = 256000;
-	_frameRate = 4;
+	_frameCount = 4;
 	_vgaBaseDelay = 1;
 	_numVars = 512;
 
@@ -940,8 +940,8 @@ int AGOSEngine::go() {
 	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 &&
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 964c8c758b..ee3e556713 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -421,7 +421,7 @@ protected:
 
 	uint16 _syncCount, _timer5, _timer4;
 
-	uint16 _frameRate;
+	uint16 _frameCount;
 
 	uint16 _zoneNumber;
 	uint16 _vgaWaitFor, _lastVgaWaitFor;
diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp
index 457e07ce35..01058938c9 100644
--- a/engines/agos/event.cpp
+++ b/engines/agos/event.cpp
@@ -236,7 +236,7 @@ void AGOSEngine::processVgaEvents() {
 			uint8 type = vte->type;
 
 			if (type == 2) {
-				vte->delay = (getGameType() == GType_SIMON2) ? 5 : _frameRate;
+				vte->delay = (getGameType() == GType_SIMON2) ? 5 : _frameCount;
 
 				animateSprites();
 
diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp
index c96ad6afdd..d80ae26a23 100644
--- a/engines/agos/vga.cpp
+++ b/engines/agos/vga.cpp
@@ -713,9 +713,9 @@ void AGOSEngine::vc12_delay() {
 	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::vc29_stopAllSounds() {
 }
 
 void AGOSEngine::vc30_setFrameRate() {
-	_frameRate = vcReadNextWord();
+	_frameCount = vcReadNextWord();
 }
 
 void AGOSEngine::vc31_setWindow() {
@@ -1346,7 +1346,7 @@ void AGOSEngine::vc42_delayIfNotEQ() {
 	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;
 	}
 }
diff --git a/engines/agos/vga_s2.cpp b/engines/agos/vga_s2.cpp
index a273b26e51..b3010702ea 100644
--- a/engines/agos/vga_s2.cpp
+++ b/engines/agos/vga_s2.cpp
@@ -48,7 +48,7 @@ void AGOSEngine_Simon2::setupVideoOpcodes(VgaOpcodeProc *op) {
 }
 
 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;