From a9bd44e66a2abc6a1258a60dc833ad70c0d86e22 Mon Sep 17 00:00:00 2001 From: azaballa Date: Sun, 17 Sep 2006 21:44:22 +0000 Subject: [PATCH] Updated GP2X button mapping to reflect change in core code. Button mapping is now mode specific, menu or emulation mode. More updates to come soon. Sorry it took so long. ;-) git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1129 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/src/gp2x/OSystemGP2X.cxx | 36 ++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/stella/src/gp2x/OSystemGP2X.cxx b/stella/src/gp2x/OSystemGP2X.cxx index 72f1cc35a..a32acc00b 100644 --- a/stella/src/gp2x/OSystemGP2X.cxx +++ b/stella/src/gp2x/OSystemGP2X.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: OSystemGP2X.cxx,v 1.9 2006-03-17 19:44:18 stephena Exp $ +// $Id: OSystemGP2X.cxx,v 1.10 2006-09-17 21:44:22 azaballa Exp $ // Modified on 2006/01/06 by Alex Zaballa for use on GP2X //============================================================================ @@ -135,17 +135,29 @@ void OSystemGP2X::getScreenDimensions(int& width, int& height) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void OSystemGP2X::setDefaultJoymap() { - myEventHandler->setDefaultJoyMapping(Event::LauncherMode, 0, 8); // Start - myEventHandler->setDefaultJoyMapping(Event::CmdMenuMode, 0, 9); // Select - myEventHandler->setDefaultJoyMapping(Event::ConsoleReset, 0, 10); // L - myEventHandler->setDefaultJoyMapping(Event::ConsoleSelect, 0, 11); // R - myEventHandler->setDefaultJoyMapping(Event::TakeSnapshot, 0, 12); // A - myEventHandler->setDefaultJoyMapping(Event::JoystickZeroFire, 0, 13); // B - myEventHandler->setDefaultJoyMapping(Event::Pause, 0, 14); // X - myEventHandler->setDefaultJoyMapping(Event::MenuMode, 0, 15); // Y - myEventHandler->setDefaultJoyMapping(Event::VolumeIncrease, 0, 16); // Vol+ - myEventHandler->setDefaultJoyMapping(Event::VolumeDecrease, 0, 17); // Vol- - myEventHandler->setDefaultJoyMapping(Event::NoType, 0, 18); // Click + myEventHandler->setDefaultJoyMapping(Event::LauncherMode, kEmulationMode, 0, 8); // Start + myEventHandler->setDefaultJoyMapping(Event::CmdMenuMode, kEmulationMode, 0, 9); // Select + myEventHandler->setDefaultJoyMapping(Event::ConsoleReset, kEmulationMode, 0, 10); // L + myEventHandler->setDefaultJoyMapping(Event::ConsoleSelect, kEmulationMode, 0, 11); // R + myEventHandler->setDefaultJoyMapping(Event::TakeSnapshot, kEmulationMode, 0, 12); // A + myEventHandler->setDefaultJoyMapping(Event::JoystickZeroFire, kEmulationMode, 0, 13); // B + myEventHandler->setDefaultJoyMapping(Event::Pause, kEmulationMode, 0, 14); // X + myEventHandler->setDefaultJoyMapping(Event::MenuMode, kEmulationMode, 0, 15); // Y + myEventHandler->setDefaultJoyMapping(Event::VolumeIncrease, kEmulationMode, 0, 16); // Vol+ + myEventHandler->setDefaultJoyMapping(Event::VolumeDecrease, kEmulationMode, 0, 17); // Vol- + myEventHandler->setDefaultJoyMapping(Event::NoType, kEmulationMode, 0, 18); // Click + //Begin Menu Navigation Mapping + myEventHandler->setDefaultJoyMapping(Event::NoType, kMenuMode, 0, 8); // Start + myEventHandler->setDefaultJoyMapping(Event::NoType, kMenuMode, 0, 9); // Select + myEventHandler->setDefaultJoyMapping(Event::UIPgUp, kMenuMode, 0, 10); // L + myEventHandler->setDefaultJoyMapping(Event::UIPgDown, kMenuMode, 0, 11); // R + myEventHandler->setDefaultJoyMapping(Event::UITabNext, kMenuMode, 0, 12); // A + myEventHandler->setDefaultJoyMapping(Event::UISelect, kMenuMode, 0, 13); // B + myEventHandler->setDefaultJoyMapping(Event::UIPrevDir, kMenuMode, 0, 14); // X + myEventHandler->setDefaultJoyMapping(Event::UINavNext, kMenuMode, 0, 15); // Y + myEventHandler->setDefaultJoyMapping(Event::NoType, kMenuMode, 0, 16); // Vol+ + myEventHandler->setDefaultJoyMapping(Event::NoType, kMenuMode, 0, 17); // Vol- + myEventHandler->setDefaultJoyMapping(Event::NoType, kMenuMode, 0, 18); // Click } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -