ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed 'Swap' to 'Toggle' in the names of the Event class for toggling 

certain other events.  A small change to be sure, but the name more
appropriately describes what the event does.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3181 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2015-06-29 11:41:22 +00:00
parent 7350e8f6c1
commit 74cf5e6f5f
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Changes.txt
View File

@ -12,10 +12,10 @@
Release History Release History
=========================================================================== ===========================================================================
4.6.1 to 4.7: (mmm dd, 2015) 4.6.1 to 4.7: (July dd, 2015)
* Added mappable events for swapping TV color/BW, left difficulty A/B * Added mappable events for toggling TV color/BW, left difficulty A/B
and right difficulty A/B. This means that one key. joystick button, and right difficulty A/B. This means that one key, joystick button,
etc can be used to toggle each event. Thanks to Buzbard of AtariAge etc can be used to toggle each event. Thanks to Buzbard of AtariAge
for the suggestion. for the suggestion.

2
src/emucore/Event.hxx
View File

@ -42,7 +42,7 @@ class Event
ConsoleLeftDiffA, ConsoleLeftDiffB, ConsoleLeftDiffA, ConsoleLeftDiffB,
ConsoleRightDiffA, ConsoleRightDiffB, ConsoleRightDiffA, ConsoleRightDiffB,
ConsoleSelect, ConsoleReset, ConsoleSelect, ConsoleReset,
ConsoleLeftDiffSwap, ConsoleRightDiffSwap, ConsoleColorSwap, ConsoleLeftDiffToggle, ConsoleRightDiffToggle, ConsoleColorToggle,
JoystickZeroUp, JoystickZeroDown, JoystickZeroLeft, JoystickZeroRight, JoystickZeroUp, JoystickZeroDown, JoystickZeroLeft, JoystickZeroRight,
JoystickZeroFire, JoystickZeroFire5, JoystickZeroFire9, JoystickZeroFire, JoystickZeroFire5, JoystickZeroFire9,

54
src/emucore/EventHandler.cxx
View File

@ -977,7 +977,7 @@ void EventHandler::handleEvent(Event::Type event, int state)
myOSystem.frameBuffer().showMessage("BW Mode"); myOSystem.frameBuffer().showMessage("BW Mode");
} }
break; break;
case Event::ConsoleColorSwap: case Event::ConsoleColorToggle:
if(state) if(state)
{ {
if(myOSystem.console().switches().tvColor()) if(myOSystem.console().switches().tvColor())
@ -1010,7 +1010,7 @@ void EventHandler::handleEvent(Event::Type event, int state)
myOSystem.frameBuffer().showMessage("Left Difficulty B"); myOSystem.frameBuffer().showMessage("Left Difficulty B");
} }
break; break;
case Event::ConsoleLeftDiffSwap: case Event::ConsoleLeftDiffToggle:
if(state) if(state)
{ {
if(myOSystem.console().switches().leftDifficultyA()) if(myOSystem.console().switches().leftDifficultyA())
@ -1043,7 +1043,7 @@ void EventHandler::handleEvent(Event::Type event, int state)
myOSystem.frameBuffer().showMessage("Right Difficulty B"); myOSystem.frameBuffer().showMessage("Right Difficulty B");
} }
break; break;
case Event::ConsoleRightDiffSwap: case Event::ConsoleRightDiffToggle:
if(state) if(state)
{ {
if(myOSystem.console().switches().rightDifficultyA()) if(myOSystem.console().switches().rightDifficultyA())
@ -2092,30 +2092,30 @@ uInt32 EventHandler::resetEventsCallback(uInt32 interval, void* param)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
EventHandler::ActionList EventHandler::ourEmulActionList[kEmulActionListSize] = { EventHandler::ActionList EventHandler::ourEmulActionList[kEmulActionListSize] = {
{ Event::ConsoleSelect, "Select", 0, true }, { Event::ConsoleSelect, "Select", 0, true },
{ Event::ConsoleReset, "Reset", 0, true }, { Event::ConsoleReset, "Reset", 0, true },
{ Event::ConsoleColor, "Color TV", 0, true }, { Event::ConsoleColor, "Color TV", 0, true },
{ Event::ConsoleBlackWhite, "Black & White TV", 0, true }, { Event::ConsoleBlackWhite, "Black & White TV", 0, true },
{ Event::ConsoleColorSwap, "Swap Color / B&W TV", 0, true }, { Event::ConsoleColorToggle, "Swap Color / B&W TV", 0, true },
{ Event::ConsoleLeftDiffA, "P0 Difficulty A", 0, true }, { Event::ConsoleLeftDiffA, "P0 Difficulty A", 0, true },
{ Event::ConsoleLeftDiffB, "P0 Difficulty B", 0, true }, { Event::ConsoleLeftDiffB, "P0 Difficulty B", 0, true },
{ Event::ConsoleLeftDiffSwap, "P0 Swap Difficulty", 0, true }, { Event::ConsoleLeftDiffToggle, "P0 Swap Difficulty", 0, true },
{ Event::ConsoleRightDiffA, "P1 Difficulty A", 0, true }, { Event::ConsoleRightDiffA, "P1 Difficulty A", 0, true },
{ Event::ConsoleRightDiffB, "P1 Difficulty B", 0, true }, { Event::ConsoleRightDiffB, "P1 Difficulty B", 0, true },
{ Event::ConsoleRightDiffSwap,"P1 Swap Difficulty", 0, true }, { Event::ConsoleRightDiffToggle, "P1 Swap Difficulty", 0, true },
{ Event::SaveState, "Save State", 0, false }, { Event::SaveState, "Save State", 0, false },
{ Event::ChangeState, "Change State", 0, false }, { Event::ChangeState, "Change State", 0, false },
{ Event::LoadState, "Load State", 0, false }, { Event::LoadState, "Load State", 0, false },
{ Event::TakeSnapshot, "Snapshot", 0, false }, { Event::TakeSnapshot, "Snapshot", 0, false },
{ Event::Fry, "Fry cartridge", 0, false }, { Event::Fry, "Fry cartridge", 0, false },
{ Event::VolumeDecrease, "Decrease volume", 0, false }, { Event::VolumeDecrease, "Decrease volume", 0, false },
{ Event::VolumeIncrease, "Increase volume", 0, false }, { Event::VolumeIncrease, "Increase volume", 0, false },
{ Event::PauseMode, "Pause", 0, false }, { Event::PauseMode, "Pause", 0, false },
{ Event::MenuMode, "Enter options menu mode", 0, false }, { Event::MenuMode, "Enter options menu mode", 0, false },
{ Event::CmdMenuMode, "Toggle command menu mode", 0, false }, { Event::CmdMenuMode, "Toggle command menu mode", 0, false },
{ Event::DebuggerMode, "Toggle debugger mode", 0, false }, { Event::DebuggerMode, "Toggle debugger mode", 0, false },
{ Event::LauncherMode, "Enter ROM launcher", 0, false }, { Event::LauncherMode, "Enter ROM launcher", 0, false },
{ Event::Quit, "Quit", 0, false }, { Event::Quit, "Quit", 0, false },
{ Event::JoystickZeroUp, "P0 Joystick Up", 0, true }, { Event::JoystickZeroUp, "P0 Joystick Up", 0, true },
{ Event::JoystickZeroDown, "P0 Joystick Down", 0, true }, { Event::JoystickZeroDown, "P0 Joystick Down", 0, true },