[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.131,1.132 resource.cpp,1.283,1.284 scumm.cpp,1.270,1.271
Chris Apers
chrilith at users.sourceforge.net
Tue Nov 9 02:27:09 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30706/scumm
Modified Files:
debugger.cpp resource.cpp scumm.cpp
Log Message:
Cleanup
Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- debugger.cpp 28 Sep 2004 19:28:58 -0000 1.131
+++ debugger.cpp 9 Nov 2004 10:26:32 -0000 1.132
@@ -40,11 +40,7 @@
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.
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- resource.cpp 18 Oct 2004 14:37:38 -0000 1.283
+++ resource.cpp 9 Nov 2004 10:26:33 -0000 1.284
@@ -424,21 +424,13 @@
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
}
}
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -d -r1.270 -r1.271
--- scumm.cpp 6 Nov 2004 01:41:32 -0000 1.270
+++ scumm.cpp 9 Nov 2004 10:26:33 -0000 1.271
@@ -635,6 +635,7 @@
_switchRoomEffect2 = 0;
_switchRoomEffect = 0;
_scrollBuffer = NULL;
+
_doEffect = false;
memset(&_flashlight, 0, sizeof(_flashlight));
_roomStrips = 0;
@@ -2482,11 +2483,7 @@
}
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);
More information about the Scummvm-git-logs
mailing list