[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.49,1.50 gameDetector.cpp,1.121,1.122 main.cpp,1.90,1.91

[Chris Apers]

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

Modified Files:
	engine.cpp gameDetector.cpp main.cpp 
Log Message:
Change PalmOS ident

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- engine.cpp	28 Aug 2005 11:15:38 -0000	1.49
+++ engine.cpp	3 Sep 2005 16:05:28 -0000	1.50
@@ -177,7 +177,7 @@
 	drawError(buf_output);
 #endif
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_MODE
 	PalmFatalError(buf_output);
 #endif
 

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- gameDetector.cpp	30 Jul 2005 21:10:57 -0000	1.121
+++ gameDetector.cpp	3 Sep 2005 16:05:28 -0000	1.122
@@ -1,643 +1,643 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001-2005 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
[...1255 lines suppressed...]
+	} else if (gameDataPath.lastChar() != '/'
+#if defined(__MORPHOS__) || defined(__amigaos4__)
+					&& gameDataPath.lastChar() != ':'
+#endif
+					&& gameDataPath.lastChar() != '\\') {
+		gameDataPath += '/';
+		ConfMan.set("path", gameDataPath, Common::ConfigManager::kTransientDomain);
+	}
+
+	return true;
+}
+
+Engine *GameDetector::createEngine(OSystem *sys) {
+	assert(_plugin);
+	return _plugin->createInstance(this, sys);
+}
+
+Audio::Mixer *GameDetector::createMixer() {
+	return new Audio::Mixer();
+}

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- main.cpp	16 Aug 2005 17:15:36 -0000	1.90
+++ main.cpp	3 Sep 2005 16:05:28 -0000	1.91
@@ -1,536 +1,535 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001-2005 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
[...1040 lines suppressed...]
+#endif
+	va_end(va);
+
+	debugHelper(buf);
+}
+
+void CDECL debug(const char *s, ...) {
+	char buf[STRINGBUFLEN];
+	va_list va;
+
+	va_start(va, s);
+#ifdef __SYMBIAN32__
+	vsprintf(buf, s, va);
+#else
+	vsnprintf(buf, STRINGBUFLEN, s, va);
+#endif
+	va_end(va);
+
+	debugHelper(buf);
+}