diff options
author | Lars Persson | 2005-07-05 20:22:56 +0000 |
---|---|---|
committer | Lars Persson | 2005-07-05 20:22:56 +0000 |
commit | d4716a1fb525540f3395262d236df51ef70874f1 (patch) | |
tree | 7e5ddbbd1b7cfb28df2c25f041bf07d487bed662 /backends/wince/CEActionsSmartphone.cpp | |
parent | 57858a8757a5b3d96958ec856862886184082652 (diff) | |
download | scummvm-rg350-d4716a1fb525540f3395262d236df51ef70874f1.tar.gz scummvm-rg350-d4716a1fb525540f3395262d236df51ef70874f1.tar.bz2 scummvm-rg350-d4716a1fb525540f3395262d236df51ef70874f1.zip |
* Start of generic key configuration support for ScummVM
* Moved KeyConfigDialog, key from WinCE to gui
* Updated wince code to inherit and use new GUI::Keys and launch new dialog
* New definition SMALL_SCREEN_DEVICE when keysdialog should be inittialized from options.cpp
* Added new function to SDL\Events that handles key remapping. LINUPY & QTOPIA remapping moved to that function. SymbianOs.cpp overrides this function to enable key remapping to events
* Compiled VC6++ project. This with warnings and errors, but NOT in the changed code. (SAGA,KYRA)
* Compiled using WCE tools 3 for X86 target and running Scummvm in emulator to test
* Compiled with UIQ target. The rest Symbian platforms might require further configuration to operate properly
* Actor.h in Saga now compiles for default VC6 setting.
* Aspect.cpp does not compile in VC6/WCE due to template problems with the kFastAndNiceAspectMode setting.
* Changed order of creation of gamedetector and mainsystem in Main.cpp
* If anything does not compile, or is totally out of order, please revert changes.
svn-id: r18498
Diffstat (limited to 'backends/wince/CEActionsSmartphone.cpp')
-rw-r--r-- | backends/wince/CEActionsSmartphone.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/backends/wince/CEActionsSmartphone.cpp b/backends/wince/CEActionsSmartphone.cpp index b732360f28..c8938b8859 100644 --- a/backends/wince/CEActionsSmartphone.cpp +++ b/backends/wince/CEActionsSmartphone.cpp @@ -57,7 +57,7 @@ void CEActionsSmartphone::init(GameDetector &detector) { } -String CEActionsSmartphone::actionName(ActionType action) { +String CEActionsSmartphone::actionName(GUI::ActionType action) { return smartphoneActionNames[action]; } @@ -74,7 +74,7 @@ int CEActionsSmartphone::version() { } CEActionsSmartphone::CEActionsSmartphone(GameDetector &detector) : - CEActions(detector) +GUI::Actions(detector) { int i; @@ -85,9 +85,9 @@ CEActionsSmartphone::CEActionsSmartphone(GameDetector &detector) : } -void CEActionsSmartphone::initInstanceMain(OSystem_WINCE3 *mainSystem) { - CEActions::initInstanceMain(mainSystem); - +void CEActionsSmartphone::initInstanceMain(OSystem *mainSystem) { + _CESystem = static_cast<OSystem_WINCE3*>(mainSystem); + GUI_Actions::initInstanceMain(mainSystem); // Mouse Up _action_enabled[SMARTPHONE_ACTION_UP] = true; // Mouse Down @@ -108,7 +108,7 @@ void CEActionsSmartphone::initInstanceGame() { bool is_queen = (_detector->_targetName == "queen"); bool is_gob = (strncmp(_detector->_targetName.c_str(), "gob", 3) == 0); - CEActions::initInstanceGame(); + GUI_Actions::initInstanceGame(); // See if a right click mapping could be needed if (is_sky || _detector->_targetName == "samnmax" || is_gob) @@ -149,14 +149,14 @@ void CEActionsSmartphone::initInstanceGame() { CEActionsSmartphone::~CEActionsSmartphone() { } -bool CEActionsSmartphone::perform(ActionType action, bool pushed) { +bool CEActionsSmartphone::perform(GUI::ActionType action, bool pushed) { if (!pushed) { switch (action) { case SMARTPHONE_ACTION_RIGHTCLICK: - _mainSystem->add_right_click(false); + _CESystem->add_right_click(false); return true; case SMARTPHONE_ACTION_LEFTCLICK: - _mainSystem->add_left_click(false); + _CESystem->add_left_click(false); return true; case SMARTPHONE_ACTION_SAVE: case SMARTPHONE_ACTION_SKIP: @@ -174,25 +174,25 @@ bool CEActionsSmartphone::perform(ActionType action, bool pushed) { EventsBuffer::simulateKey(&_key_action[action], true); return true; case SMARTPHONE_ACTION_RIGHTCLICK: - _mainSystem->add_right_click(true); + _CESystem->add_right_click(true); return true; case SMARTPHONE_ACTION_LEFTCLICK: - _mainSystem->add_left_click(true); + _CESystem->add_left_click(true); return true; case SMARTPHONE_ACTION_UP: - _mainSystem->move_cursor_up(); + _CESystem->move_cursor_up(); return true; case SMARTPHONE_ACTION_DOWN: - _mainSystem->move_cursor_down(); + _CESystem->move_cursor_down(); return true; case SMARTPHONE_ACTION_LEFT: - _mainSystem->move_cursor_left(); + _CESystem->move_cursor_left(); return true; case SMARTPHONE_ACTION_RIGHT: - _mainSystem->move_cursor_right(); + _CESystem->move_cursor_right(); return true; case SMARTPHONE_ACTION_ZONE: - _mainSystem->switch_zone(); + _CESystem->switch_zone(); return true; } |