[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.580,1.581 scumm.cpp,1.436,1.437 input.cpp,2.23,2.24 script_v8.cpp,2.289,2.290

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17696

Modified Files:
	scumm.h scumm.cpp input.cpp script_v8.cpp 
Log Message:
Move _numActors to a more sensible place, and make it protected; fix confirmFOODialog() method names to comply with our guidelines

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -d -r1.580 -r1.581
--- scumm.h	17 Apr 2005 12:55:42 -0000	1.580
+++ scumm.h	17 Apr 2005 22:40:44 -0000	1.581
@@ -384,7 +384,6 @@
 	byte _gameId;
 	byte _version;
 	byte _heversion;
-	byte _numActors;
 	uint32 _features;						// Should only be accessed for reading (TODO enforce it compiler-wise with making it private and creating an accessor)
 	uint8 _gameMD5[16];
 
@@ -465,19 +464,18 @@
 	Dialog *_versionDialog;
 	Dialog *_mainMenuDialog;
 
-protected:
 	int runDialog(Dialog &dialog);
-	void confirmexitDialog();
-	void confirmrestartDialog();
+	void confirmExitDialog();
+	void confirmRestartDialog();
 	void pauseDialog();
 	void versionDialog();
 	void mainMenuDialog();
-protected:
+
 	char displayMessage(const char *altButton, const char *message, ...);
 
-protected:
 	byte _fastMode;
 
+	byte _numActors;
 	Actor *_actors;	// Has _numActors elements
 	
 	byte *_arraySlot;

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -d -r1.436 -r1.437
--- scumm.cpp	17 Apr 2005 11:24:42 -0000	1.436
+++ scumm.cpp	17 Apr 2005 22:40:44 -0000	1.437
@@ -2274,18 +2274,18 @@
 	runDialog(*_mainMenuDialog);
 }
 
-void ScummEngine::confirmexitDialog() {
-	ConfirmDialog confirmExitDialog(this, "Do you really want to quit (y/n)?");
+void ScummEngine::confirmExitDialog() {
+	ConfirmDialog d(this, "Do you really want to quit (y/n)?");
 
-	if (runDialog(confirmExitDialog)) {
+	if (runDialog(d)) {
 		_quit = true;
 	}
 }
 
-void ScummEngine::confirmrestartDialog() {
-	ConfirmDialog confirmRestartDialog(this, "Do you really want to restart (y/n)?");
+void ScummEngine::confirmRestartDialog() {
+	ConfirmDialog d(this, "Do you really want to restart (y/n)?");
 
-	if (runDialog(confirmRestartDialog)) {
+	if (runDialog(d)) {
 		restart();
 	}
 }

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.23
retrieving revision 2.24
diff -u -d -r2.23 -r2.24
--- input.cpp	6 Apr 2005 17:31:05 -0000	2.23
+++ input.cpp	17 Apr 2005 22:40:45 -0000	2.24
@@ -193,7 +193,7 @@
 	
 		case OSystem::EVENT_QUIT:
 			if (_confirmExit)
-				confirmexitDialog();
+				confirmExitDialog();
 			else
 				_quit = true;
 			break;
@@ -375,7 +375,7 @@
 
 	if (VAR_RESTART_KEY != 0xFF && _lastKeyHit == VAR(VAR_RESTART_KEY) ||
 	   (((_version <= 2) || (_features & GF_FMTOWNS && _version == 3)) && _lastKeyHit == 8)) {
-		confirmrestartDialog();
+		confirmRestartDialog();
 		return;
 	}
 

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.289
retrieving revision 2.290
diff -u -d -r2.289 -r2.290
--- script_v8.cpp	17 Apr 2005 12:55:42 -0000	2.289
+++ script_v8.cpp	17 Apr 2005 22:40:45 -0000	2.290
@@ -1307,7 +1307,7 @@
 		break;
 	case 34:	// queryQuit
 		if (_confirmExit)
-			confirmexitDialog();
+			confirmExitDialog();
 		else
 			_quit = true;
 		break;