move "merged input" test into InputMapper; this moves the GAMESTATE

dependency out of Game (doesn't belong in InputMapper either, working on
it ...)
This commit is contained in:
Glenn Maynard
2006-09-30 03:08:18 +00:00
parent 5e99a1c9e9
commit 261849d895
2 changed files with 16 additions and 24 deletions
+6
View File
@@ -777,6 +777,12 @@ MenuButton InputMapper::GameToMenu( const GameInput &GameI )
void InputMapper::MenuToGame( MenuButton MenuI, PlayerNumber pn, GameInput GameIout[4] )
{
if( GAMESTATE->GetCurrentStyle() )
{
if( GAMESTATE->GetCurrentStyle()->m_StyleType == ONE_PLAYER_TWO_SIDES )
pn = PLAYER_INVALID;
}
const Game* pGame = GAMESTATE->GetCurrentGame();
pGame->MenuButtonToGameInputs( MenuI, pn, GameIout );
}