Cleanup

svn-id: r15739

3 files changed, 3 insertions, 18 deletions

diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp
index 1d77d2bbe4..1abc6832ea 100644
--- a/scumm/debugger.cpp
+++ b/scumm/debugger.cpp
@@ -40,11 +40,7 @@ extern uint16 g_debugLevel;
 namespace Scumm {
 
 void CDECL debugC(int channel, const char *s, ...) {
-#ifdef __PALM_OS__
-	char buf[256]; // 1024 is too big overflow the stack
-#else
-	char buf[1024];
-#endif
+	char buf[STRINGBUFLEN];
 	va_list va;
 
 	// FIXME: Still spew all debug at -d9, for crashes in startup etc.
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index 54d967c280..724073b094 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -424,21 +424,13 @@ void ScummEngine::askForDisk(const char *filename, int disknum) {
 
 		result = displayMessage("Quit", buf);
 		if (!result) {
-#ifdef __PALM_OS__
 			error("Cannot find file: '%s'", filename);
-#else
-			_system->quit();
-#endif
 		}
 	} else { 
 		sprintf(buf, "Cannot find file: '%s'", filename);
 		InfoDialog dialog(this, (char*)buf);
 		runDialog(dialog);
-#ifdef __PALM_OS__
 		error("Cannot find file: '%s'", filename);
-#else
-		_system->quit();
-#endif
 	}
 }
 
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 9207f19431..e880b47a0f 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -635,6 +635,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
 	_switchRoomEffect2 = 0;
 	_switchRoomEffect = 0;
 	_scrollBuffer = NULL;
+
 	_doEffect = false;
 	memset(&_flashlight, 0, sizeof(_flashlight));
 	_roomStrips = 0;
@@ -2482,11 +2483,7 @@ void ScummEngine::confirmrestartDialog() {
 }
 
 char ScummEngine::displayMessage(const char *altButton, const char *message, ...) {
-#ifdef __PALM_OS__
-	char buf[256]; // 1024 is too big overflow the stack
-#else
-	char buf[1024];
-#endif
+	char buf[STRINGBUFLEN];
 	va_list va;
 
 	va_start(va, message);