diff options
| author | Lars Persson | 2006-04-12 19:04:10 +0000 |
|---|---|---|
| committer | Lars Persson | 2006-04-12 19:04:10 +0000 |
| commit | 1d265f18956cb78cfe2d9c92462853b057c2b2ef (patch) | |
| tree | ff9f6f53af1bab024ef8aa90ba1b9c014f8d07f5 /base | |
| parent | cdcf44d3f3cb2920ffd57317b126651076ca7e21 (diff) | |
| download | scummvm-rg350-1d265f18956cb78cfe2d9c92462853b057c2b2ef.tar.gz scummvm-rg350-1d265f18956cb78cfe2d9c92462853b057c2b2ef.tar.bz2 scummvm-rg350-1d265f18956cb78cfe2d9c92462853b057c2b2ef.zip | |
Commiting Fingolfins patch to remove gamedetector usage.
svn-id: r21830
Diffstat (limited to 'base')
| -rw-r--r-- | base/main.cpp | 10 | ||||
| -rw-r--r-- | base/main.h | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/base/main.cpp b/base/main.cpp index 2b3ecfabb3..d82b238b97 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -230,11 +230,7 @@ static int runGame(GameDetector &detector, OSystem &system, const Common::String return result; } -#ifdef _WIN32_WCE -extern "C" int scummvm_main(GameDetector &detector, int argc, char *argv[]) { -#else extern "C" int scummvm_main(int argc, char *argv[]) { -#endif Common::String specialDebug; Common::String command; bool running = true; @@ -291,14 +287,12 @@ extern "C" int scummvm_main(int argc, char *argv[]) { // Process the remaining command line settings -#ifndef _WIN32_WCE GameDetector detector; -#endif detector.processSettings(command, settings); -#ifdef __SYMBIAN32__ +#if defined(__SYMBIAN32__) || defined(_WIN32_WCE) // init keymap support here: we wanna move this somewhere else? - GUI::Actions::init(detector); + GUI::Actions::init(detector._gameid); #endif #ifdef PALMOS_68K diff --git a/base/main.h b/base/main.h index 06b7e2cb5f..8abf5038a0 100644 --- a/base/main.h +++ b/base/main.h @@ -29,10 +29,6 @@ // // The scummvm main entry point, to be invoked by ports // -#ifdef _WIN32_WCE -extern "C" int scummvm_main(GameDetector &detector, int argc, char *argv[]); -#else extern "C" int scummvm_main(int argc, char *argv[]); -#endif #endif |