Commit Graph

77 Commits

Author SHA1 Message Date
Glenn Maynard 5bc8fc0ad2 add InputMapper::GetLevel 2007-01-13 06:55:47 +00:00
Glenn Maynard 4b16146370 remove typedef 2007-01-13 06:44:16 +00:00
Glenn Maynard badbe3ddd6 Previously, each GameButton had a SecondaryFunction; MenuButtons
mapped to each corresponding GameButton, and to each GameButton
with a matching SecondaryFunction.

Simplify.  Now, MenuButtons map to each GameButton with a matching
SecondaryFunction.  Merged GetMenuButtonSecondaryFunction and
GameButtonToMenuButton.

("MenuButtons" and "SecondaryFunction" are confusing legacy
terminology now.  Changing it once I figure out what to change
it to ...)
2007-01-13 06:36:55 +00:00
Glenn Maynard 8b279db97f cleaner, more consistent SecondaryFunction handling 2007-01-13 05:41:40 +00:00
Glenn Maynard 0e70d6205b remove unused 2007-01-13 04:06:49 +00:00
Glenn Maynard 58065fa455 MenuButton -> GameButton 2007-01-13 03:47:36 +00:00
Glenn Maynard 095b6f5ba0 GameToMenu -> GameButtonToMenuButton 2007-01-13 01:16:00 +00:00
Glenn Maynard f5d285e51b GameInputToMenuButton -> GameButtonToMenuButton 2007-01-13 01:13:20 +00:00
Glenn Maynard f8e9574f1e merge m_SecondaryMenuButton into GameButtonInfo 2007-01-13 00:12:08 +00:00
Glenn Maynard 59e880e760 invert m_SecondaryMenuButton. This way, it only has as many
entries as that game has buttons; adding global GAME_BUTTONs
doesn't need adding dummy entries to each one of these.
2007-01-12 23:44:14 +00:00
Glenn Maynard 369a060afa Don't duplicate the data for common GameButtons.
InputScheme separates the generic, low-level engine data
from the Game*-specific high-level data.  GameButtonType
is a high-level distinction; in fact, it's only needed
for custom GameButtons (eg. DANCE_BUTTON_*), since the
function of generic GameButtons (GAME_BUTTON_*) can simply
be identified by their value--that's why, for example, we
don't have GameButtonType for GAME_BUTTON_COIN.
2007-01-12 22:57:55 +00:00
Glenn Maynard 4d761d588e Define keyboard mappings with InputMapping. Add a
default keyboard mapping, so we don't have to define
mappings for common keys in every game.
2007-01-12 08:00:31 +00:00
Glenn Maynard bcc126848d allow deviceButton or gb to be invalid 2007-01-12 06:04:14 +00:00
Glenn Maynard 24d5d5220c move out InputMapper::Mapping 2007-01-12 06:03:08 +00:00
Glenn Maynard 3ff773e575 handle slot indexes automatically 2007-01-12 01:42:35 +00:00
Glenn Maynard 59da84966f merge code for common GameButtons 2007-01-11 06:31:48 +00:00
Glenn Maynard 91ee16754f move GetMenuButtonSecondaryFunction into InputScheme 2006-11-21 07:16:19 +00:00
Glenn Maynard 67433f7f83 add FOREACH_GameButtonInScheme 2006-11-21 05:39:56 +00:00
Glenn Maynard 5cc5462722 header cleanup 2006-11-21 05:17:01 +00:00
Chris Danford 5216992b26 change InputScheme for easier maintenance of game definitions 2006-10-23 06:47:54 +00:00
Glenn Maynard cb746be4c3 Invalid 2006-10-07 03:43:41 +00:00
Glenn Maynard fa60068e06 GetNumGameplayButtons unused 2006-09-30 22:34:55 +00:00
Glenn Maynard ecef158b06 eliminate InputMapper dependency on GameState. GameState
now tells InputMapper if it should join players.
2006-09-30 22:29:03 +00:00
Glenn Maynard 928e950006 Most of Game is generic, but not all. Split the InputMapper-
specific stuff apart into InputScheme.
2006-09-30 08:18:36 +00:00
Glenn Maynard 6e6ea7971d NUM_GameButton 2006-09-27 04:39:51 +00:00
Glenn Maynard d19fdc9caf NUM_GameController 2006-09-26 20:57:31 +00:00
Glenn Maynard dd2f259a2f MenuInput -> MenuButton 2006-09-14 20:45:51 +00:00
Glenn Maynard f652510cc5 RepeatStopKey: stop repeating a key until it's released 2006-09-14 20:39:54 +00:00
Glenn Maynard a05fe7e8ab simplify GameToMenu 2006-09-14 20:37:41 +00:00
Glenn Maynard 2c3ea735a8 remove transition 2006-09-14 03:45:52 +00:00
Glenn Maynard 0244e48eca transitional: accept pn arg to MenuInput helpers 2006-09-14 03:34:52 +00:00
Glenn Maynard d5857acb3a A problem with removing StyleI.player: an obscure difference
between StyleI.player and MenuI.player is that StyleI is set even
if there's no attached MenuButton, and MenuI.player is set even
if there's no attached column.  That's an odd distinction, anyway.

Move input.MenuI.player to input.pn.  This also puts it in the
same place as input.mp.
2006-09-13 09:57:07 +00:00
Glenn Maynard 09663989be typo 2006-09-13 08:24:21 +00:00
Glenn Maynard 5ca7cf8809 cleanup 2006-09-13 08:23:28 +00:00
Glenn Maynard 86857bd6e5 remove unused InputMapper::IsMapped(GameInput) 2006-09-13 02:27:36 +00:00
Glenn Maynard b53c99f406 remove InputMapper::StyleToGame(StyleI). InputMapper no longer knows about StyleInputs, putting them at the level of abstraction they belong: above the game-neutral support classes like InputMapper. 2006-09-13 01:55:39 +00:00
Glenn Maynard d6ad18f73e remove InputMapper::IsBeingPressed(StyleI) 2006-09-13 01:45:10 +00:00
Glenn Maynard 9f54f1b248 remove InputMapper::GetSecsHeld(StyleI) 2006-09-13 01:38:10 +00:00
Glenn Maynard 7da7f3af18 remove unused 2006-09-13 01:33:04 +00:00
Glenn Maynard 9139883e64 simplify 2006-09-13 01:18:11 +00:00
Glenn Maynard 10c6320d18 getting rid of StyleI.player 2006-09-13 00:05:01 +00:00
Glenn Maynard 87bb92451b StyleI.player duplicates MenuI.player when the style is set. It's
essentially being used as a hack to see if the style is set, and
as a shortcut for converting from StyleInput back to GameInput,
complicating InputEventPlus in the process.  Remove it, and just
pass along the PlayerNumber when it's actually needed.

(incremental commit)
2006-09-13 00:02:23 +00:00
Glenn Maynard 2fa74742c0 remove unused 2006-09-12 23:47:55 +00:00
Glenn Maynard d93a57c841 add DeviceInputList * 2006-09-08 04:04:40 +00:00
Glenn Maynard c4c73b5179 remove transition 2006-09-08 02:13:54 +00:00
Glenn Maynard ec3b9382d2 InputMapper::IsButtonDown -> IsBeingPressed, to match InputFilter::IsBeingPressed 2006-09-08 02:12:30 +00:00
Steve Checkoway cff13747a6 Cleanup. 2006-09-02 20:17:17 +00:00
Glenn Maynard 94780b3fad support MultiPlayer inputs 2006-07-01 02:16:38 +00:00
Chris Danford c1848ab4a5 unmap joystick before applying its automappings 2006-02-09 00:04:01 +00:00
Chris Danford e507e4ab9e only save mappings for user-changable mapping slots (less cluttered keymaps.ini) 2006-01-26 06:05:35 +00:00