diff options
author | Cameron Cawley | 2019-11-10 16:34:25 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2019-11-17 22:33:56 +0100 |
commit | f2b9f7bb76c041825bef1dcee3abf17d923898da (patch) | |
tree | 9ead87f005a086b6c1cb2cfe4e81d846e3e691dc /engines | |
parent | c5a5e0f68a8d740f37f234e773988e8f58273466 (diff) | |
download | scummvm-rg350-f2b9f7bb76c041825bef1dcee3abf17d923898da.tar.gz scummvm-rg350-f2b9f7bb76c041825bef1dcee3abf17d923898da.tar.bz2 scummvm-rg350-f2b9f7bb76c041825bef1dcee3abf17d923898da.zip |
BACKENDS: Remove the Windows CE port
Diffstat (limited to 'engines')
-rw-r--r-- | engines/drascula/drascula.cpp | 28 | ||||
-rw-r--r-- | engines/engine.cpp | 12 | ||||
-rw-r--r-- | engines/lure/menu.cpp | 2 | ||||
-rw-r--r-- | engines/scumm/input.cpp | 14 | ||||
-rw-r--r-- | engines/sky/control.cpp | 3 |
5 files changed, 3 insertions, 56 deletions
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index 02fe2114a9..bf9e9fb329 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -578,15 +578,7 @@ bool DrasculaEngine::runCurrentChapter() { _canSaveLoad = true; delay(25); -#ifndef _WIN32_WCE - // FIXME - // This and the following #ifndefs disable the excess updateEvents() calls *within* the game loop. - // Events such as keypresses or mouse clicks are dropped on the ground with no processing - // by these calls. They are properly handled by the implicit call through getScan() below. - // It is not a good practice to not process events and indeed this created problems with synthesized - // events in the wince port. updateEvents(); -#endif _canSaveLoad = false; if (_loadedDifferentChapter) return true; @@ -594,12 +586,7 @@ bool DrasculaEngine::runCurrentChapter() { if (!_menuScreen && takeObject == 1) checkObjects(); -#ifdef _WIN32_WCE - if (_rightMouseButton) { - if (_menuScreen) { -#else if (_rightMouseButton == 1 && _menuScreen) { -#endif _rightMouseButton = 0; if (currentChapter == 2) { loadPic(menuBackground, cursorSurface); @@ -610,16 +597,11 @@ bool DrasculaEngine::runCurrentChapter() { } setPalette((byte *)&gamePalette); _menuScreen = false; -#ifndef _WIN32_WCE // FIXME: This call here is in hope that it will catch the rightmouseup event so the // next if block won't be executed. This too is not a good coding practice. I've recoded it // with a mutual exclusive if block for the menu. I would commit this properly but I cannot test // for other (see Desktop) ports right now. updateEvents(); -#endif -#ifdef _WIN32_WCE - } else { -#else } // Do not show the inventory screen in chapter 5, if the right mouse button is clicked @@ -627,7 +609,6 @@ bool DrasculaEngine::runCurrentChapter() { // Fixes bug #2059621 - "DRASCULA: Plug bug" if (_rightMouseButton == 1 && !_menuScreen && !(currentChapter == 5 && pickedObject == 16)) { -#endif _rightMouseButton = 0; _characterMoved = false; if (trackProtagonist == 2) @@ -646,14 +627,9 @@ bool DrasculaEngine::runCurrentChapter() { loadPic("icons.alg", cursorSurface); } _menuScreen = true; -#ifndef _WIN32_WCE updateEvents(); -#endif selectVerb(kVerbNone); } -#ifdef _WIN32_WCE - } -#endif if (_leftMouseButton == 1 && _menuBar) { selectVerbFromBar(); @@ -842,11 +818,7 @@ void DrasculaEngine::updateEvents() { updateMusic(); -#ifdef _WIN32_WCE - if (eventMan->pollEvent(event)) { -#else while (eventMan->pollEvent(event)) { -#endif switch (event.type) { case Common::EVENT_KEYDOWN: if (event.kbd.keycode == Common::KEYCODE_d && event.kbd.hasFlags(Common::KBD_CTRL)) { diff --git a/engines/engine.cpp b/engines/engine.cpp index bee51778c9..c16c1f909d 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -22,7 +22,7 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_getcwd -#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) +#if defined(WIN32) && !defined(__SYMBIAN32__) #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <direct.h> @@ -65,10 +65,6 @@ #include "common/text-to-speech.h" #endif -#ifdef _WIN32_WCE -extern bool isSmartphone(); -#endif - // FIXME: HACK for error() Engine *g_engine = 0; @@ -87,10 +83,6 @@ static void defaultErrorHandler(const char *msg) { // now invoke the debugger, if available / supported. if (g_engine) { GUI::Debugger *debugger = g_engine->getDebugger(); -#ifdef _WIN32_WCE - if (isSmartphone()) - debugger = 0; -#endif #if defined(USE_TASKBAR) g_system->getTaskbarManager()->notifyError(); @@ -412,7 +404,7 @@ void GUIErrorMessageFormat(const char *fmt, ...) { } void Engine::checkCD() { -#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) +#if defined(WIN32) && !defined(__SYMBIAN32__) // It is a known bug under Windows that games that play CD audio cause // ScummVM to crash if the data files are read from the same CD. Check // if this appears to be the case and issue a warning. diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp index d074649544..4983088f89 100644 --- a/engines/lure/menu.cpp +++ b/engines/lure/menu.cpp @@ -31,7 +31,7 @@ #include "lure/events.h" #include "lure/lure.h" -#if defined(_WIN32_WCE) || defined(__SYMBIAN32__) || defined(WEBOS) || defined(__ANDROID__) || defined(__WII__) +#if defined(__SYMBIAN32__) || defined(WEBOS) || defined(__ANDROID__) || defined(__WII__) #define LURE_CLICKABLE_MENUS #endif diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index 9c5271e51c..ecc1a16d29 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -41,9 +41,6 @@ #include "scumm/sound.h" -#ifdef _WIN32_WCE -#define KEY_ALL_SKIP 3457 -#endif namespace Scumm { @@ -350,17 +347,6 @@ void ScummEngine::processInput() { _leftBtnPressed &= ~msClicked; _rightBtnPressed &= ~msClicked; -#ifdef _WIN32_WCE - if (lastKeyHit.ascii == KEY_ALL_SKIP) { - // Skip talk - if (VAR_TALKSTOP_KEY != 0xFF && _talkDelay > 0) { - lastKeyHit = Common::KeyState(Common::KEYCODE_PERIOD); - } else { - lastKeyHit = Common::KeyState(Common::KEYCODE_ESCAPE); - } - } -#endif - if (!lastKeyHit.ascii) return; diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp index 83088db889..a7c39f7f6a 100644 --- a/engines/sky/control.cpp +++ b/engines/sky/control.cpp @@ -1553,9 +1553,6 @@ void Control::delay(unsigned int amount) { } uint this_delay = 20; // 1? -#ifdef _WIN32_WCE - this_delay = 10; -#endif if (this_delay > amount) this_delay = amount; |