diff options
| -rw-r--r-- | backends/platform/gp2x/gp2x-common.h | 3 | ||||
| -rw-r--r-- | backends/platform/linuxmoto/linuxmoto-main.cpp | 6 | ||||
| -rw-r--r-- | backends/platform/samsungtv/samsungtv.cpp | 1 | ||||
| -rw-r--r-- | backends/platform/sdl/sdl.h | 2 | ||||
| -rw-r--r-- | backends/platform/symbian/src/SymbianOS.cpp | 3 | ||||
| -rw-r--r-- | backends/platform/symbian/src/SymbianOS.h | 49 |
6 files changed, 31 insertions, 33 deletions
diff --git a/backends/platform/gp2x/gp2x-common.h b/backends/platform/gp2x/gp2x-common.h index d2eddaea0b..4d2a9c33cc 100644 --- a/backends/platform/gp2x/gp2x-common.h +++ b/backends/platform/gp2x/gp2x-common.h @@ -34,9 +34,6 @@ class OSystem_GP2X : public OSystem_POSIX { public: - OSystem_GP2X() {} - virtual ~OSystem_GP2X() {} - virtual void initBackend(); virtual void quit(); virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0); diff --git a/backends/platform/linuxmoto/linuxmoto-main.cpp b/backends/platform/linuxmoto/linuxmoto-main.cpp index dfd1428d8b..e9f2e661de 100644 --- a/backends/platform/linuxmoto/linuxmoto-main.cpp +++ b/backends/platform/linuxmoto/linuxmoto-main.cpp @@ -23,9 +23,6 @@ * */ -#include "common/scummsys.h" -#include "common/system.h" - #include "backends/platform/linuxmoto/linuxmoto-sdl.h" #include "base/main.h" @@ -35,6 +32,9 @@ int main(int argc, char *argv[]) { g_system = new OSystem_LINUXMOTO(); assert(g_system); + // Pre initialize the backend + ((OSystem_POSIX *)g_system)->init(); + // Invoke the actual ScummVM main entry point: int res = scummvm_main(argc, argv); diff --git a/backends/platform/samsungtv/samsungtv.cpp b/backends/platform/samsungtv/samsungtv.cpp index 34ddbd2f10..1e316aa840 100644 --- a/backends/platform/samsungtv/samsungtv.cpp +++ b/backends/platform/samsungtv/samsungtv.cpp @@ -38,6 +38,7 @@ bool OSystem_SDL_SamsungTV::hasFeature(Feature f) { } void OSystem_SDL_SamsungTV::initBackend() { + // Create the events manager if (_eventManager == 0) _eventManager = new SamsungTVSdlEventManager(this); diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index f2b513752f..eb3d22d524 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -63,7 +63,7 @@ public: */ virtual SdlMixerManager *getMixerManager(); - // Override functions from ModularBackend + // Override functions from ModularBackend and OSystem virtual void initBackend(); virtual Common::HardwareKeySet *getHardwareKeySet(); virtual void quit(); diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index abb067e60b..3a0dc318b3 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -71,9 +71,6 @@ OSystem_SDL_Symbian::OSystem_SDL_Symbian() } -OSystem_SDL_Symbian::~OSystem_SDL_Symbian() { -} - void OSystem_SDL_Symbian::init() { _RFs = &CEikonEnv::Static()->FsSession(); _fsFactory = new SymbianFilesystemFactory(); diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h index 6c89779e89..e5f4ea44d0 100644 --- a/backends/platform/symbian/src/SymbianOS.h +++ b/backends/platform/symbian/src/SymbianOS.h @@ -32,39 +32,40 @@ class RFs; class OSystem_SDL_Symbian : public OSystem_SDL { public: OSystem_SDL_Symbian(); - ~OSystem_SDL_Symbian(); - // Overloaded from OSystem_SDL - void init(); - void initBackend(); - void quit(); - void engineInit(); - void engineDone(); - bool setGraphicsMode(const char *name); - Common::String getDefaultConfigFileName(); - void setupIcon(); + // Override from OSystem_SDL + virtual void init(); + virtual void initBackend(); + virtual void quit(); + virtual void engineInit(); + virtual void engineDone(); + virtual bool setGraphicsMode(const char *name); + virtual Common::String getDefaultConfigFileName(); + virtual void setupIcon(); - // Returns reference to File session + /** + * Returns reference to File session + */ RFs& FsSession(); void quitWithErrorMsg(const char *msg); - // vibration support + // Vibration support #ifdef USE_VIBRA_SE_PXXX - // - // Intialize the vibration api used if present and supported - // + /** + * Intialize the vibration api used if present and supported + */ void initializeVibration(); - // - // Turn vibration on, repeat no time - // @param vibraLength number of repetitions - // + /** + * Turn vibration on, repeat no time + * @param vibraLength number of repetitions + */ void vibrationOn(int vibraLength); - // - // Turns the vibration off - // + /** + * Turns the vibration off + */ void vibrationOff(); protected: @@ -72,7 +73,9 @@ protected: #endif // USE_VIBRA_SE_PXXX protected: - // Used to intialized special game mappings + /** + * Used to intialized special game mappings + */ void checkMappings(); RFs* _RFs; |