HOPKINS: More renaming in ObjectsManager

scummvm · Jan 21, 2013 · 33636f0 · 33636f0
1 parent de2fa9a
commit 33636f0
Show file tree

Hide file tree

Showing 9 changed files with 345 additions and 345 deletions.
diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp
@@ -248,7 +248,7 @@ void ComputerManager::showComputer(ComputerEnum mode) {
 					break;
 				case '6':
 					readText(10);
-					_vm->_globals._saveData->data[svField270] = 4;
+					_vm->_globals._saveData->_data[svField270] = 4;
 					break;
 				}
 			}

diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
@@ -399,9 +399,9 @@ void DialogsManager::showInventory() {
 				break;
 
 			_vm->_scriptManager.TRAVAILOBJET = true;
-			_vm->_globals._saveData->data[svField3] = _vm->_globals._curObjectIndex;
-			_vm->_globals._saveData->data[svField8] = _vm->_globals._inventory[newInventoryItem];
-			_vm->_globals._saveData->data[svField9] = _vm->_eventsManager._mouseCursorId;
+			_vm->_globals._saveData->_data[svField3] = _vm->_globals._curObjectIndex;
+			_vm->_globals._saveData->_data[svField8] = _vm->_globals._inventory[newInventoryItem];
+			_vm->_globals._saveData->_data[svField9] = _vm->_eventsManager._mouseCursorId;
 			_vm->_objectsManager.OPTI_OBJET();
 			_vm->_scriptManager.TRAVAILOBJET = false;
 
@@ -483,20 +483,20 @@ void DialogsManager::inventAnim() {
 		_vm->_objectsManager.I_old_x = newOffset;
 	}
 
-	if (_vm->_globals._saveData->data[svField357] == 1) {
-		if (_vm->_globals._saveData->data[svField353] == 1)
+	if (_vm->_globals._saveData->_data[svField357] == 1) {
+		if (_vm->_globals._saveData->_data[svField353] == 1)
 			_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager._vesaBuffer, _vm->_globals.TETE, 832, 325, 0, 0, 0, 0);
-		if (_vm->_globals._saveData->data[svField355] == 1)
+		if (_vm->_globals._saveData->_data[svField355] == 1)
 			_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager._vesaBuffer, _vm->_globals.TETE, 866, 325, 1, 0, 0, 0);
 		_vm->_graphicsManager.addVesaSegment(532, 25, 560, 60);
 		_vm->_graphicsManager.addVesaSegment(566, 25, 594, 60);
 	}
-	if (_vm->_globals._saveData->data[svField356] == 1) {
+	if (_vm->_globals._saveData->_data[svField356] == 1) {
 		_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager._vesaBuffer, _vm->_globals.TETE, 832, 325, 0, 0, 0, 0);
 		_vm->_graphicsManager.addVesaSegment(532, 25, 560, 60);
 	}
 
-	if (_vm->_globals._saveData->data[svField354] == 1) {
+	if (_vm->_globals._saveData->_data[svField354] == 1) {
 		_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager._vesaBuffer, _vm->_globals.TETE, 832, 325, 0, 0, 0, 0);
 		_vm->_graphicsManager.addVesaSegment(532, 25, 560, 60);
 	}

diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
@@ -268,7 +268,7 @@ enum PlayerCharacter { CHARACTER_HOPKINS = 0, CHARACTER_HOPKINS_CLONE = 1, CHARA
 
 // TODO: Sauvegrade1 fields should really be mapped into data array
 struct Sauvegarde {
-	byte data[2050];
+	byte _data[2050];
 	CharacterLocation _cloneHopkins;
 	CharacterLocation _realHopkins;
 	CharacterLocation _samantha;