diff options
| author | anotherguest | 2013-11-26 10:39:46 +0100 |
|---|---|---|
| committer | anotherguest | 2013-11-26 10:39:46 +0100 |
| commit | f4137df940c1f0532742f2eb1894db2947944f66 (patch) | |
| tree | 31336eb5bb4378014a0e17259a64f95790ebcc21 /backends/platform | |
| parent | 7c3588ec2a74aa75e3e1a06849b751b3c203d42a (diff) | |
| download | scummvm-rg350-f4137df940c1f0532742f2eb1894db2947944f66.tar.gz scummvm-rg350-f4137df940c1f0532742f2eb1894db2947944f66.tar.bz2 scummvm-rg350-f4137df940c1f0532742f2eb1894db2947944f66.zip | |
SYMBIAN OS:Removed resolution fix from Symbian OS Backend, handle this in SDL backend instead. Add more engines for the split build.
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/symbian/BuildPackageUpload_LocalSettings.pl | 8 | ||||
| -rw-r--r-- | backends/platform/symbian/src/SymbianOS.cpp | 25 | ||||
| -rw-r--r-- | backends/platform/symbian/src/SymbianOS.h | 2 |
3 files changed, 7 insertions, 28 deletions
diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl index 5b88b9d4f5..c72258b8d7 100644 --- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl +++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl @@ -5,7 +5,7 @@ scumm agos sky queen gob groovie saga drascula kyra lure agi touche parallaction cine cruise made tinsel tucker sword1 sword2 draci sci teenagent mohawk hugo toon tsage cge - composer toltecs tony wintermute pegasus hopkins avalanche dreamweb fullpipe mortevielle neverhood zvision + composer toltecs tony wintermute pegasus hopkins avalanche dreamweb fullpipe mortevielle neverhood zvision lastexpress ); @WorkingEngines_1st = qw( @@ -13,13 +13,17 @@ drascula touche parallaction cine cruise made tucker composer toltecs tony pegasus + avalanche fullpipe + neverhood lastexpress ); @WorkingEngines_2nd = qw( agos sky gob kyra lure agi tinsel sword1 sword2 draci sci teenagent - hugo toon tsage cge hopkins + hugo toon tsage cge hopkins + dreamweb mortevielle + zvision ); @TestingEngines = qw( diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index 101b216493..ead85a933e 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -178,31 +178,6 @@ RFs& OSystem_SDL_Symbian::FsSession() { return *_RFs; } -void OSystem_SDL_Symbian::initSize(uint w, uint h, const Graphics::PixelFormat *format ) { - if(w != 640 && w != 320) { - if(w > 320) { - w = 640; - } - else { - w = 320; - } - } - - if(h != 480 && h != 400 && h != 240 && h != 200) { - if(h > 400) { - h = 480; - } else if(h > 240){ - h = 400; - } else if(h > 200) { - h = 240; - } else { - h = 200; - } - } - - ModularBackend::initSize(w, h, format); -} - // Symbian bsearch implementation is flawed void* scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)) { // Perform binary search diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h index 89ae0d825c..74a102dc15 100644 --- a/backends/platform/symbian/src/SymbianOS.h +++ b/backends/platform/symbian/src/SymbianOS.h @@ -39,7 +39,7 @@ public: virtual bool setGraphicsMode(const char *name); virtual Common::String getDefaultConfigFileName(); virtual void setupIcon(); - virtual void initSize(uint w, uint h, const Graphics::PixelFormat *format ); + /** * Returns reference to File session */ |