Ancurio
/
mkxp-freebird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor cleanups and documentation

This commit is contained in:
Jonas Kulla 2013-09-02 12:31:02 +02:00
parent a6ee6bd043
commit 7ea875ae5d
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/input.cpp
View File

@ -56,7 +56,7 @@ struct KbBindingData
struct JsBindingData struct JsBindingData
{ {
unsigned int source; int source;
Input::ButtonCode target; Input::ButtonCode target;
}; };
@ -117,7 +117,7 @@ struct JsButtonBinding : public Binding
return true; return true;
} }
unsigned int source; int source;
}; };
/* Joystick axis binding */ /* Joystick axis binding */
@ -233,6 +233,8 @@ static const JsBindingData defaultJsBindings[] =
static elementsN(defaultJsBindings); static elementsN(defaultJsBindings);
/* Maps ButtonCode enum values to indices
* in the button state array */
static const int mapToIndex[] = static const int mapToIndex[] =
{ {
0, 0, 0, 0,
@ -269,10 +271,10 @@ static const int deadDirFlags[] =
static const Input::ButtonCode otherDirs[4][3] = static const Input::ButtonCode otherDirs[4][3] =
{ {
{ Input::Left, Input::Right, Input::Up }, // Down { Input::Left, Input::Right, Input::Up }, /* Down */
{ Input::Down, Input::Up, Input::Right }, // Left { Input::Down, Input::Up, Input::Right }, /* Left */
{ Input::Down, Input::Up, Input::Left }, // Right { Input::Down, Input::Up, Input::Left }, /* Right */
{ Input::Left, Input::Right, Input::Up } // Up { Input::Left, Input::Right, Input::Up } /* Up */
}; };
struct InputPrivate struct InputPrivate
@ -363,7 +365,7 @@ struct InputPrivate
void clearBuffer() void clearBuffer()
{ {
static int size = sizeof(ButtonState) * Input::buttonCodeSize; const size_t size = sizeof(ButtonState) * Input::buttonCodeSize;
memset(states, 0, size); memset(states, 0, size);
} }
@ -424,8 +426,8 @@ struct InputPrivate
void pollBindings(Input::ButtonCode &repeatCand) void pollBindings(Input::ButtonCode &repeatCand)
{ {
Q_FOREACH (const Binding *b, bindings) for (int i = 0; i < bindings.count(); ++i)
pollBindingPriv(*b, repeatCand); pollBindingPriv(*bindings[i], repeatCand);
updateDir4(); updateDir4();
updateDir8(); updateDir8();