[Scummvm-cvs-logs] scummvm master -> 6647df482b54c78cbab96a4bc731f8a12598d402

Strangerke Strangerke at scummvm.org
Thu Dec 19 00:06:41 CET 2013


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:
6647df482b TSAGE: BF - Renaming in scene 410


Commit: 6647df482b54c78cbab96a4bc731f8a12598d402
    https://github.com/scummvm/scummvm/commit/6647df482b54c78cbab96a4bc731f8a12598d402
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-12-18T15:06:08-08:00

Commit Message:
TSAGE: BF - Renaming in scene 410

Changed paths:
    engines/tsage/blue_force/blueforce_scenes4.cpp
    engines/tsage/blue_force/blueforce_scenes4.h



diff --git a/engines/tsage/blue_force/blueforce_scenes4.cpp b/engines/tsage/blue_force/blueforce_scenes4.cpp
index e4a349b..2b4c0ff 100644
--- a/engines/tsage/blue_force/blueforce_scenes4.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes4.cpp
@@ -295,9 +295,9 @@ bool Scene410::Driver::startAction(CursorType action, Event &event) {
 			}
 		} else if (!scene->_cuffedDriverFl) {
 			SceneItem::display2(410, 7);
-		} else if (!scene->_field1FC0) {
+		} else if (!scene->_getDriverFl) {
 			scene->_sceneMode = 4124;
-			scene->_field1FC0 = true;
+			scene->_getDriverFl = true;
 			T2_GLOBALS._uiElements.addScore(30);
 			scene->signal();
 		} else {
@@ -483,7 +483,7 @@ bool Scene410::Harrison::startAction(CursorType action, Event &event) {
 		} else {
 			BF_GLOBALS._player.disableControl();
 			scene->_cuffedDriverFl = true;
-			scene->_field1FC0 = true;
+			scene->_getDriverFl = true;
 			BF_GLOBALS._walkRegions.enableRegion(22);
 			scene->_sceneMode = 4109;
 			scene->_stripManager.start(4112, scene);
@@ -505,7 +505,7 @@ Scene410::Scene410(): SceneExt() {
 
 	_action1Count = _talkCount = 0;
 	_cuffedPassengerFl = false;
-	_field1FC0 = false;
+	_getDriverFl = false;
 }
 
 void Scene410::synchronize(Serializer &s) {
@@ -515,7 +515,7 @@ void Scene410::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_harrissonTalkFl);
 	s.syncAsSint16LE(_cuffedDriverFl);
 	s.syncAsSint16LE(_cuffedPassengerFl);
-	s.syncAsSint16LE(_field1FC0);
+	s.syncAsSint16LE(_getDriverFl);
 	s.syncAsSint16LE(_driverOutOfTruckFl);
 	s.syncAsSint16LE(_harrisonMovedFl);
 }
diff --git a/engines/tsage/blue_force/blueforce_scenes4.h b/engines/tsage/blue_force/blueforce_scenes4.h
index 92e91c9..e5877df 100644
--- a/engines/tsage/blue_force/blueforce_scenes4.h
+++ b/engines/tsage/blue_force/blueforce_scenes4.h
@@ -120,7 +120,7 @@ public:
 	bool _harrissonTalkFl;
 	bool _cuffedDriverFl;
 	bool _cuffedPassengerFl;
-	bool _field1FC0;
+	bool _getDriverFl;
 	bool _driverOutOfTruckFl, _harrisonMovedFl;
 
 	Scene410();






More information about the Scummvm-git-logs mailing list