[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.53,1.54 main.cpp,1.97,1.98

[Lars Persson]

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

Modified Files:
	engine.cpp main.cpp 
Log Message:
1. New build structure for Symbian builds to allow easier build and project updates
2. Updated framework files for new structure
3. Uncommented Debug statements in vorbis.cpp (Should probably be removed alltogether.
4. Incorporated Sevs code formatting changes in the new Symbian source structure.
5. Removed/Changed EScummVM to ScummVM instead, hopefully most cases covered.
6. Beginning vibration support to be used for Scumm shake effects (Work ongoing by SumthinWicked)
7. Replaced the ScummVM icon for the FavIcon and upscaled the icon to 32x32. I think it looks ok, comments are welcome.
8. Built for S60V1 and UIQ2 targets from the cvs
9. Updated Readme with new build instructions.

Any comments are welcome.  Hopefully the other builds are not affected by this and all Sevs code updates are also incorporated.

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- engine.cpp	27 Nov 2005 02:35:57 -0000	1.53
+++ engine.cpp	3 Dec 2005 21:29:10 -0000	1.54
@@ -191,6 +191,9 @@
 	PalmFatalError(buf_output);
 #endif
 
+#ifdef __SYMBIAN32__
+	SymbianFatalError(buf_output);
+#endif
 	// Finally exit. quit() will terminate the program if g_system iss present
 	if (g_system)
 		g_system->quit();
@@ -203,11 +206,7 @@
 	va_list va;
 
 	va_start(va, s);
-#ifdef __SYMBIAN32__
-	vsprintf(buf, s, va);
-#else
 	vsnprintf(buf, STRINGBUFLEN, s, va);
-#endif
 	va_end(va);
 
 #ifdef __GP32__ //ph0x FIXME: implement fprint?

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- main.cpp	27 Nov 2005 02:35:57 -0000	1.97
+++ main.cpp	3 Dec 2005 21:29:11 -0000	1.98
@@ -515,11 +515,7 @@
 		return;
 
 	va_start(va, s);
-#ifdef __SYMBIAN32__
-	vsprintf(buf, s, va);
-#else
 	vsnprintf(buf, STRINGBUFLEN, s, va);
-#endif
 	va_end(va);
 
 	debugHelper(buf);
@@ -530,11 +526,7 @@
 	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);