[Scummvm-cvs-logs] scummvm master -> 302c733df9105439b49752cf9d7eb09aefe7f794

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
302c733df9 TSAGE: BF - Cleanup: Rename two more global variables


Commit: 302c733df9105439b49752cf9d7eb09aefe7f794
    https://github.com/scummvm/scummvm/commit/302c733df9105439b49752cf9d7eb09aefe7f794
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-11-09T00:19:33-08:00

Commit Message:
TSAGE: BF - Cleanup: Rename two more global variables

Changed paths:
    engines/tsage/blue_force/blueforce_scenes1.cpp
    engines/tsage/globals.cpp
    engines/tsage/globals.h



diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp
index b8c09d3..66ed605 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes1.cpp
@@ -1017,7 +1017,7 @@ bool Scene115::Object1::startAction(CursorType action, Event &event) {
 		if (scene->_field31E8 == 0) {
 			BF_GLOBALS._player.disableControl();
 			scene->_sceneMode = 0;
-			if (BF_GLOBALS._v4CEAA == 0)
+			if (BF_GLOBALS._tonyDialogCtr == 0)
 				scene->_stripManager.start(1167, scene);
 			else if (BF_GLOBALS.getFlag(fShowedIdToKate))
 				scene->_stripManager.start(1159, scene);
@@ -1036,7 +1036,7 @@ bool Scene115::Object1::startAction(CursorType action, Event &event) {
 		return true;
 	case INV_ID:
 		if (scene->_field31E8 == 0) {
-			if (BF_GLOBALS._v4CEAA == 0) {
+			if (BF_GLOBALS._tonyDialogCtr == 0) {
 				scene->_sceneMode = 1167;
 				scene->setAction(&scene->_action6);
 			} else if (BF_GLOBALS.getFlag(fShowedIdToKate)) {
@@ -1077,7 +1077,7 @@ bool Scene115::Object2::startAction(CursorType action, Event &event) {
 			else if (BF_INVENTORY.getObjectScene(INV_COBB_RAP) == 1) {
 				if (BF_GLOBALS.getFlag(fTalkedToTony))
 					scene->_sceneMode = 1151;
-				else if (BF_GLOBALS._v4CEAA == 0) {
+				else if (BF_GLOBALS._tonyDialogCtr == 0) {
 					scene->_sceneMode = 1150;
 					BF_GLOBALS.setFlag(fTalkedToTony);
 				} else
@@ -1111,7 +1111,7 @@ bool Scene115::Object2::startAction(CursorType action, Event &event) {
 	case INV_COBB_RAP:
 		if (BF_GLOBALS.getFlag(onDuty))
 			scene->_sceneMode = 1177;
-		else if (BF_GLOBALS._v4CEAA == 0)
+		else if (BF_GLOBALS._tonyDialogCtr == 0)
 			scene->_sceneMode = 1179;
 		else
 			scene->_sceneMode = 1154;
@@ -1132,11 +1132,11 @@ bool Scene115::Object2::startAction(CursorType action, Event &event) {
 			} else {
 				T2_GLOBALS._uiElements.addScore(30);
 				BF_GLOBALS.setFlag(fTalkedToTony);
-				if (BF_GLOBALS._v4CEAA == 0) {
+				if (BF_GLOBALS._tonyDialogCtr == 0) {
 					scene->_sceneMode = 1150;
 					scene->setAction(&scene->_action9);
 				} else {
-					BF_GLOBALS._v4CEAA = 1;
+					BF_GLOBALS._tonyDialogCtr = 1;
 					scene->setAction(&scene->_action2);
 				}
 			}
@@ -1339,7 +1339,7 @@ void Scene115::Action2::signal() {
 	switch (_actionIndex++) {
 	case 0:
 		BF_GLOBALS._player.disableControl();
-		if (BF_GLOBALS._v4CEAA < 3) {
+		if (BF_GLOBALS._tonyDialogCtr < 3) {
 			if (scene->_object2._position.x > 67) {
 				scene->_object2.setAction(&scene->_sequenceManager3, NULL, 1118, &scene->_object2, NULL);
 			} else if (scene->_object2._position.x != 67) {
@@ -1349,10 +1349,10 @@ void Scene115::Action2::signal() {
 		BF_GLOBALS._player.setAction(&scene->_sequenceManager1, this, 1117, &BF_GLOBALS._player);
 		break;
 	case 1:
-		BF_GLOBALS._v4CEAA++;
+		++BF_GLOBALS._tonyDialogCtr;
 		if (BF_GLOBALS.getFlag(onDuty)) {
 			if (BF_GLOBALS.getFlag(fTalkedToTony)) {
-				switch (BF_GLOBALS._v4CEAA) {
+				switch (BF_GLOBALS._tonyDialogCtr) {
 				case 1:
 					T2_GLOBALS._uiElements.addScore(30);
 					scene->_stripManager.start(1181, this);
@@ -1369,7 +1369,7 @@ void Scene115::Action2::signal() {
 			}
 		} else {
 			if (BF_GLOBALS.getFlag(fTalkedToTony)) {
-				switch (BF_GLOBALS._v4CEAA) {
+				switch (BF_GLOBALS._tonyDialogCtr) {
 				case 1:
 					T2_GLOBALS._uiElements.addScore(30);
 					scene->_stripManager.start(1153, this);
@@ -1387,7 +1387,7 @@ void Scene115::Action2::signal() {
 		}
 		break;
 	case 2:
-		if (BF_GLOBALS._v4CEAA == 3)
+		if (BF_GLOBALS._tonyDialogCtr == 3)
 			scene->_object2.setAction(&scene->_sequenceManager3, NULL, 3119, &scene->_object2, NULL);
 		BF_GLOBALS._player.enableControl();
 		remove();
@@ -1507,11 +1507,11 @@ void Scene115::Action7::signal() {
 		break;
 	case 1:
 		BF_GLOBALS._player.setStrip(4);
-		if (BF_GLOBALS._v4CEB0 == 0)
+		if (BF_GLOBALS._kateDialogCtr == 0)
 			scene->_stripManager.start(1156, this);
 		else
 			scene->_stripManager.start(1157, this);
-		BF_GLOBALS._v4CEB0++;
+		++BF_GLOBALS._kateDialogCtr;
 		break;
 	case 2:
 		BF_GLOBALS._player.enableControl();
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index c2c9a4f..3bf9722 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -233,9 +233,9 @@ void BlueForceGlobals::synchronize(Serializer &s) {
 		int tmpVar;
 		s.syncAsSint16LE(tmpVar);
 	}
-	s.syncAsSint16LE(_v4CEAA);
+	s.syncAsSint16LE(_tonyDialogCtr);
 	s.syncAsSint16LE(_marinaWomanCtr);
-	s.syncAsSint16LE(_v4CEB0);
+	s.syncAsSint16LE(_kateDialogCtr);
 	s.syncAsSint16LE(_v4CEB6);
 	s.syncAsSint16LE(_safeCombination);
 	s.syncAsSint16LE(_v4CEC0);
@@ -290,9 +290,9 @@ void BlueForceGlobals::reset() {
 
 	_interfaceY = UI_INTERFACE_Y;
 	_dayNumber = 0;
-	_v4CEAA = 0;
+	_tonyDialogCtr = 0;
 	_marinaWomanCtr = 0;
-	_v4CEB0 = 0;
+	_kateDialogCtr = 0;
 	_v4CEB6 = 0;
 	_safeCombination = 0;
 	_v4CEC0 = 0;
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 3d3ccb9..21a4b92 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -187,9 +187,9 @@ public:
 	ASoundExt _sound1, _sound3;
 	StripProxy _stripProxy;
 	int _dayNumber;
-	int _v4CEAA;
+	int _tonyDialogCtr;
 	int _marinaWomanCtr;
-	int _v4CEB0;
+	int _kateDialogCtr;
 	int _v4CEB6;
 	int _safeCombination;
 	int _v4CEC0;