[Scummvm-cvs-logs] scummvm master -> c74361b0b63e315597ff8c83704f379726558166

Strangerke Strangerke at scummvm.org
Tue Feb 26 23:55:54 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:
c74361b0b6 HOPKINS: Get rid of a magic value in save/load dialogs


Commit: c74361b0b63e315597ff8c83704f379726558166
    https://github.com/scummvm/scummvm/commit/c74361b0b63e315597ff8c83704f379726558166
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-02-26T14:54:50-08:00

Commit Message:
HOPKINS: Get rid of a magic value in save/load dialogs

Changed paths:
    engines/hopkins/dialogs.cpp
    engines/hopkins/dialogs.h



diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
index 6ccb601..6cfd1f7 100644
--- a/engines/hopkins/dialogs.cpp
+++ b/engines/hopkins/dialogs.cpp
@@ -568,7 +568,7 @@ void DialogsManager::testDialogOpening() {
  */
 void DialogsManager::showLoadGame() {
 	_vm->_eventsManager.VBL();
-	showSaveLoad(2);
+	showSaveLoad(MODE_LOAD);
 
 	int slotNumber;
 	do {
@@ -597,7 +597,7 @@ void DialogsManager::showLoadGame() {
 void DialogsManager::showSaveGame() {
 	_vm->_eventsManager.VBL();
 
-	showSaveLoad(1);
+	showSaveLoad(MODE_SAVE);
 	int slotNumber;
 	do {
 		slotNumber = searchSavegames();
@@ -625,7 +625,7 @@ void DialogsManager::showSaveGame() {
 /**
  * Load/Save dialog
  */
-void DialogsManager::showSaveLoad(int a1) {
+void DialogsManager::showSaveLoad(SaveLoadMode mode) {
 	Common::String filename;
 
 	if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
@@ -649,14 +649,14 @@ void DialogsManager::showSaveLoad(int a1) {
 	_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager._vesaBuffer, _vm->_objectsManager._saveLoadSprite, _vm->_eventsManager._startPos.x + 483, 360, 0);
 
 	if (_vm->_globals._language == LANG_FR) {
-		if (a1 == 1)
+		if (mode == MODE_SAVE)
 			_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager._vesaBuffer, _vm->_objectsManager._saveLoadSprite, _vm->_eventsManager._startPos.x + 525, 375, 1);
-		else if (a1 == 2)
+		else if (mode == MODE_LOAD)
 			_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager._vesaBuffer, _vm->_objectsManager._saveLoadSprite, _vm->_eventsManager._startPos.x + 515, 375, 2);
 	} else {
-		if (a1 == 1)
+		if (mode == MODE_SAVE)
 			_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager._vesaBuffer, _vm->_objectsManager._saveLoadSprite, _vm->_eventsManager._startPos.x + 535, 372, 1);
-		else if (a1 == 2)
+		else if (mode == MODE_LOAD)
 			_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager._vesaBuffer, _vm->_objectsManager._saveLoadSprite, _vm->_eventsManager._startPos.x + 539, 372, 2);
 	}
 
diff --git a/engines/hopkins/dialogs.h b/engines/hopkins/dialogs.h
index fd35eca..4fa8091 100644
--- a/engines/hopkins/dialogs.h
+++ b/engines/hopkins/dialogs.h
@@ -31,6 +31,8 @@ namespace Hopkins {
 
 class HopkinsEngine;
 
+enum SaveLoadMode { MODE_SAVE = 1, MODE_LOAD = 2 };
+
 /**
  * Class for manging game dialogs
  */
@@ -38,7 +40,7 @@ class DialogsManager {
 private:
 	HopkinsEngine *_vm;
 
-	void showSaveLoad(int a1);
+	void showSaveLoad(SaveLoadMode mode);
 	int  searchSavegames();
 public:
 	byte *_inventWin1;






More information about the Scummvm-git-logs mailing list