mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 06:24:32 +00:00
Code Issues Releases Wiki Activity

Fix some things/typos that were overlooked

Browse source
This commit is contained in:
fgenesis 2016-08-07 05:20:04 +02:00
parent 812dc7dd7f
commit 7b702673fe
6 changed files with 27 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
BBGE/Core.cpp
View file

@ -3059,9 +3059,9 @@ void Core::clearActionButtons()
actionStatus.clear();
}
Joystick *Core::getJoystickForSourceID(unsigned sourceID)
Joystick *Core::getJoystickForSourceID(int sourceID)
{
if(sourceID < (unsigned)actionStatus.size())
return getJoystick(actionStatus[sourceID]->getJoystickID());
if(unsigned(sourceID+1) < (unsigned)actionStatus.size())
return getJoystick(actionStatus[sourceID+1]->getJoystickID());
return NULL;
}

2
BBGE/Core.h
View file

@ -564,7 +564,7 @@ public:
Joystick *getJoystick(int idx); // warning: may return NULL/contain holes
// not the actual number of joysticks!
size_t getNumJoysticks() const { return joysticks.size(); }
Joystick *getJoystickForSourceID(unsigned sourceID);
Joystick *getJoystickForSourceID(int sourceID);
private:
std::vector<Joystick*> joysticks;
};

2
BBGE/GameKeys.h
View file

@ -64,7 +64,7 @@
#define KEY_G SDL_SCANCODE_G
#define KEY_H SDL_SCANCODE_H
#define KEY_I SDL_SCANCODE_I
#define KEY_J SDL_SCANCODE_K
#define KEY_J SDL_SCANCODE_J
#define KEY_K SDL_SCANCODE_K
#define KEY_L SDL_SCANCODE_L
#define KEY_M SDL_SCANCODE_M