remove typedef
This commit is contained in:
@@ -52,7 +52,7 @@ struct AutoJoyMapping
|
|||||||
const char *szGame;
|
const char *szGame;
|
||||||
const char *szDriverRegex; // reported by InputHandler
|
const char *szDriverRegex; // reported by InputHandler
|
||||||
const char *szControllerName; // the product name of the controller
|
const char *szControllerName; // the product name of the controller
|
||||||
InputMapper::Mapping maps[32];
|
InputMapping maps[32];
|
||||||
};
|
};
|
||||||
#define END_MARKER {-1, DeviceButton_Invalid, GameButton_Invalid, false }, // end marker
|
#define END_MARKER {-1, DeviceButton_Invalid, GameButton_Invalid, false }, // end marker
|
||||||
const InputMapping g_DefaultKeyMappings[] =
|
const InputMapping g_DefaultKeyMappings[] =
|
||||||
@@ -498,7 +498,7 @@ void InputMapper::Unmap( InputDevice id )
|
|||||||
UpdateTempDItoGI();
|
UpdateTempDItoGI();
|
||||||
}
|
}
|
||||||
|
|
||||||
void InputMapper::ApplyMapping( const Mapping *maps, GameController gc, InputDevice id )
|
void InputMapper::ApplyMapping( const InputMapping *maps, GameController gc, InputDevice id )
|
||||||
{
|
{
|
||||||
map<GameInput, int> MappedButtons;
|
map<GameInput, int> MappedButtons;
|
||||||
|
|
||||||
|
|||||||
@@ -98,13 +98,11 @@ public:
|
|||||||
void RepeatStopKey( const GameInput &GameI );
|
void RepeatStopKey( const GameInput &GameI );
|
||||||
void RepeatStopKey( GameButton MenuI, PlayerNumber pn );
|
void RepeatStopKey( GameButton MenuI, PlayerNumber pn );
|
||||||
|
|
||||||
typedef InputMapping Mapping;
|
|
||||||
|
|
||||||
static InputDevice MultiPlayerToInputDevice( MultiPlayer mp );
|
static InputDevice MultiPlayerToInputDevice( MultiPlayer mp );
|
||||||
static MultiPlayer InputDeviceToMultiPlayer( InputDevice id );
|
static MultiPlayer InputDeviceToMultiPlayer( InputDevice id );
|
||||||
|
|
||||||
void Unmap( InputDevice device );
|
void Unmap( InputDevice device );
|
||||||
void ApplyMapping( const Mapping *maps, GameController gc, InputDevice device );
|
void ApplyMapping( const InputMapping *maps, GameController gc, InputDevice device );
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// all the DeviceInputs that map to a GameInput
|
// all the DeviceInputs that map to a GameInput
|
||||||
|
|||||||
Reference in New Issue
Block a user