mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2025-07-03 22:44:32 +00:00
more oops
This commit is contained in:
parent
262c8d3870
commit
f31a8c8e89
3 changed files with 4 additions and 5 deletions
|
@ -46,12 +46,12 @@ ActionMapper::ActionMapper()
|
||||||
cleared = false;
|
cleared = false;
|
||||||
inputEnabled = true;
|
inputEnabled = true;
|
||||||
inUpdate = false;
|
inUpdate = false;
|
||||||
InputMapper::RegisterActionMapper(this);
|
IInputMapper::RegisterActionMapper(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
ActionMapper::~ActionMapper()
|
ActionMapper::~ActionMapper()
|
||||||
{
|
{
|
||||||
InputMapper::UnregisterActionMapper(this);
|
IInputMapper::UnregisterActionMapper(this);
|
||||||
clearCreatedEvents();
|
clearCreatedEvents();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ IInputMapper::IInputMapper()
|
||||||
|
|
||||||
IInputMapper::~IInputMapper()
|
IInputMapper::~IInputMapper()
|
||||||
{
|
{
|
||||||
InputSystem::addMapper(this);
|
InputSystem::removeMapper(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------
|
// ------------------
|
||||||
|
@ -69,7 +69,6 @@ InputMapper::InputMapper(int playerID)
|
||||||
|
|
||||||
InputMapper::~InputMapper()
|
InputMapper::~InputMapper()
|
||||||
{
|
{
|
||||||
InputSystem::removeMapper(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static float rescale(float t, float lower, float upper, float rangeMin, float rangeMax)
|
static float rescale(float t, float lower, float upper, float rangeMin, float rangeMax)
|
||||||
|
|
|
@ -48,7 +48,7 @@ class InputMapper : public IInputMapper
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
InputMapper(int playerID);
|
InputMapper(int playerID);
|
||||||
~InputMapper();
|
virtual ~InputMapper();
|
||||||
|
|
||||||
bool acceptMouse;
|
bool acceptMouse;
|
||||||
int acceptMouseID; // -1: accept all, otherwise: that id
|
int acceptMouseID; // -1: accept all, otherwise: that id
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue