From b53c99f406127d60b6e4773de43a68a2c712c969 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 13 Sep 2006 01:55:39 +0000 Subject: [PATCH] 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. --- stepmania/src/InputMapper.cpp | 7 ------- stepmania/src/InputMapper.h | 3 --- 2 files changed, 10 deletions(-) diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp index 569fae3339..08dfb9e0b5 100644 --- a/stepmania/src/InputMapper.cpp +++ b/stepmania/src/InputMapper.cpp @@ -777,13 +777,6 @@ void InputMapper::GameToMenu( const GameInput &GameI, MenuInput &MenuI ) MenuI = pGame->GameInputToMenuInput( GameI ); } -void InputMapper::StyleToGame( const StyleInput &StyleI, PlayerNumber pn, GameInput &GameI ) -{ - const Style* pStyle = GAMESTATE->GetCurrentStyle(); - GameI = pStyle->StyleInputToGameInput( StyleI, pn ); -} - - void InputMapper::MenuToGame( const MenuInput &MenuI, GameInput GameIout[4] ) { const Game* pGame = GAMESTATE->GetCurrentGame(); diff --git a/stepmania/src/InputMapper.h b/stepmania/src/InputMapper.h index 5177b8e068..4d3c960784 100644 --- a/stepmania/src/InputMapper.h +++ b/stepmania/src/InputMapper.h @@ -6,7 +6,6 @@ #include "RageInputDevice.h" #include "GameInput.h" #include "MenuInput.h" -#include "StyleInput.h" #include "GameConstantsAndTypes.h" const int NUM_GAME_TO_DEVICE_SLOTS = 5; // five device inputs may map to one game input @@ -38,8 +37,6 @@ public: bool DeviceToGame( const DeviceInput &DeviceI, GameInput& GameI ); // return true if there is a mapping from device to pad bool GameToDevice( const GameInput &GameI, int iSoltNum, DeviceInput& DeviceI ); // return true if there is a mapping from pad to device - void StyleToGame( const StyleInput &StyleI, PlayerNumber pn, GameInput &GameI ); - void GameToMenu( const GameInput &GameI, MenuInput &MenuI ); void MenuToGame( const MenuInput &MenuI, GameInput GameIout[4] );