Commit Graph

184 Commits

Author SHA1 Message Date
Glenn Maynard d7d4470f09 use GetGameButtonInfo 2007-01-13 05:45:40 +00:00
Glenn Maynard 8b279db97f cleaner, more consistent SecondaryFunction handling 2007-01-13 05:41:40 +00:00
Glenn Maynard 58065fa455 MenuButton -> GameButton 2007-01-13 03:47:36 +00:00
Glenn Maynard a4cf344876 make GameButton an enum 2007-01-13 03:13:22 +00:00
Glenn Maynard ebcf1e0235 unify GameButton and MenuButton 2007-01-13 02:40:10 +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 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 c129a5f6dd merge code for common GameButtons (buttons in every game) 2007-01-11 06:10:18 +00:00
Glenn Maynard 91ee16754f move GetMenuButtonSecondaryFunction into InputScheme 2006-11-21 07:16:19 +00:00
Glenn Maynard 5bfcb8b1c1 if button is GameButton_Invalid, don't set controller either 2006-11-21 06:57:07 +00:00
Glenn Maynard 67433f7f83 add FOREACH_GameButtonInScheme 2006-11-21 05:39:56 +00:00
Chris Danford 5216992b26 change InputScheme for easier maintenance of game definitions 2006-10-23 06:47:54 +00:00
Glenn Maynard 9b0c213a03 fix inconsistent behavior because of out of date cache 2006-10-09 02:12:55 +00:00
Glenn Maynard 2ce839e4eb Invalid 2006-10-07 04:25:28 +00:00
Glenn Maynard cb746be4c3 Invalid 2006-10-07 03:43:41 +00:00
Glenn Maynard 1a89ddfccd pointer to attributes 2006-10-03 00:07:01 +00:00
Glenn Maynard 83defce27b XML update 2006-10-02 22:52:57 +00:00
Glenn Maynard 56d3ecf83d move InputScheme code into InputMapper 2006-09-30 22:36:01 +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
Steve Checkoway c404b1ccb3 Initialize. 2006-09-30 09:27:34 +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 85fc5a2dfb simplify (now InputMapper::ControllerToPlayerNumber logic is the
same as InputMapper::MenuToGame)
2006-09-30 05:52:06 +00:00
Glenn Maynard 13085923c5 simplify 2006-09-30 05:49:54 +00:00
Glenn Maynard 261849d895 move "merged input" test into InputMapper; this moves the GAMESTATE
dependency out of Game (doesn't belong in InputMapper either, working on
it ...)
2006-09-30 03:08:18 +00:00
Glenn Maynard 6e6ea7971d NUM_GameButton 2006-09-27 04:39:51 +00:00
Glenn Maynard 9e879c57a6 FOREACH_GameButton 2006-09-27 04:29:12 +00:00
Glenn Maynard 1641aec026 InputDevice_Invalid 2006-09-26 21:10:47 +00:00
Glenn Maynard cf5dba03a4 GameController_Invalid 2006-09-26 20:59:40 +00:00
Glenn Maynard d19fdc9caf NUM_GameController 2006-09-26 20:57:31 +00:00
Glenn Maynard a7e98a7ece FOREACH_GameController 2006-09-26 20:52:11 +00:00
Glenn Maynard 7de372bd1d simplify 2006-09-15 05:25:51 +00:00
Glenn Maynard 0d138e13d8 MenuInputToGameInput -> MenuButtonToGameInputs 2006-09-14 20:57:07 +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 3fe68d7f7d simplify 2006-09-14 05:18:40 +00:00
Glenn Maynard 5a890ba48d use GameInputToMenuButton 2006-09-14 03:49:12 +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 8277bdf5dd typo 2006-09-13 03:20:59 +00:00
Glenn Maynard e206261b80 ARRAYSIZE -> ARRAYLEN 2006-09-13 03:11:38 +00:00
Glenn Maynard 86857bd6e5 remove unused InputMapper::IsMapped(GameInput) 2006-09-13 02:27:36 +00:00