[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.195,1.196 scumm.cpp,1.8,1.9 scumm.h,1.387,1.388

[Max Horn]

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

Modified Files:
	resource.cpp scumm.cpp scumm.h 
Log Message:
rename displayError() to displayMessage(); fix slightly incorrect usage of that method

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- resource.cpp	23 Mar 2004 01:59:02 -0000	1.195
+++ resource.cpp	28 Mar 2004 13:28:44 -0000	1.196
@@ -241,7 +241,7 @@
 		sprintf(buf, "Cannot find file: '%s'\nInsert disc %d into drive %s\nPress OK to retry, Quit to exit", filename, disknum, getGameDataPath());
 #endif
 
-		result = displayError("Quit", buf);
+		result = displayMessage("Quit", buf);
 		if (result == 2)
 			error("Cannot find file: '%s'", filename);
 	} else { 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- scumm.cpp	23 Mar 2004 03:33:23 -0000	1.8
+++ scumm.cpp	28 Mar 2004 13:28:44 -0000	1.9
@@ -1420,7 +1420,7 @@
 
 		makeSavegameName(filename, _saveLoadSlot, _saveTemporaryState);
 		if (!success) {
-			displayError(0, errMsg, filename);
+			displayMessage(0, errMsg, filename);
 		} else if (_saveLoadFlag == 1 && _saveLoadSlot != 0 && !_saveTemporaryState) {
 			// Display "Save successful" message, except for auto saves
 #ifdef __PALM_OS__
@@ -2526,7 +2526,7 @@
 
 void ScummEngine::startManiac() {
 	warning("stub startManiac()");
-	displayError("Alright", "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' directory inside the Tentacle game directory.");
+	displayMessage(0, "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' directory inside the Tentacle game directory.");
 }
 
 #pragma mark -
@@ -2588,7 +2588,7 @@
 	}
 }
 
-char ScummEngine::displayError(const char *altButton, const char *message, ...) {
+char ScummEngine::displayMessage(const char *altButton, const char *message, ...) {
 #ifdef __PALM_OS__
 	char buf[256]; // 1024 is too big overflow the stack
 #else
@@ -2597,7 +2597,7 @@
 	va_list va;
 
 	va_start(va, message);
-	vsprintf(buf, message, va);
+	vsnprintf(buf, sizeof(buf), message, va);
 	va_end(va);
 
 	GUI::MessageDialog dialog(buf, "OK", altButton);

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -d -r1.387 -r1.388
--- scumm.h	23 Mar 2004 01:59:02 -0000	1.387
+++ scumm.h	28 Mar 2004 13:28:44 -0000	1.388
@@ -386,7 +386,7 @@
 public:
 	void optionsDialog();	// Used by MainMenuDialog::handleCommand()
 protected:
-	char displayError(const char *altButton, const char *message, ...);
+	char displayMessage(const char *altButton, const char *message, ...);
 
 protected:
 	byte _fastMode;