diff options
| author | Lars Persson | 2005-12-03 21:29:13 +0000 |
|---|---|---|
| committer | Lars Persson | 2005-12-03 21:29:13 +0000 |
| commit | 6ed67205ec31305ad19f2e4469de27e7a93c51e8 (patch) | |
| tree | d32eeffc50c1a9a4d6d3db6c29e1f1774d441f63 /base | |
| parent | 02f5921cbeca2352df9fa84628d3e835df15cc2a (diff) | |
| download | scummvm-rg350-6ed67205ec31305ad19f2e4469de27e7a93c51e8.tar.gz scummvm-rg350-6ed67205ec31305ad19f2e4469de27e7a93c51e8.tar.bz2 scummvm-rg350-6ed67205ec31305ad19f2e4469de27e7a93c51e8.zip | |
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.
svn-id: r19739
Diffstat (limited to 'base')
| -rw-r--r-- | base/engine.cpp | 7 | ||||
| -rw-r--r-- | base/main.cpp | 8 |
2 files changed, 3 insertions, 12 deletions
diff --git a/base/engine.cpp b/base/engine.cpp index 5e2d1289cb..aa029ab6d9 100644 --- a/base/engine.cpp +++ b/base/engine.cpp @@ -191,6 +191,9 @@ void NORETURN CDECL error(const char *s, ...) { 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 @@ void CDECL warning(const char *s, ...) { 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? diff --git a/base/main.cpp b/base/main.cpp index 8b3426324a..f5f604b7b6 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -515,11 +515,7 @@ void CDECL debug(int level, const char *s, ...) { 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 @@ void CDECL debug(const char *s, ...) { 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); |