ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug #1799454 (help menu bug), and a minor coding style improvements related to it.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1269 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
cosmosninja 2007-09-29 19:08:35 +00:00
parent 32b88d2091
commit d06c13fb36
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/help_menu.cpp
View File

@ -190,7 +190,7 @@ get stuck or fall too far, use the rescue button to get back on track."),
const int LABEL_ID = widgetSet->varray(HS3);
widgetSet -> filler(HS3);
for(int i = KC_LEFT; i <= KC_LAST; i++)
for(int i = KC_FIRST; i <= KC_LAST; i++)
{
// *sigh* widget set stores only pointer to strings, so
// to make sure that all key-strings are permanent, they

2
src/gui/help_menu.hpp
View File

@ -30,7 +30,7 @@ class ssgContext;
class HelpMenu: public BaseGUI
{
private:
std::string m_all_keys[KC_FIRE+1];
std::string m_all_keys[KC_LAST+1];
ssgContext* m_context;
ssgTransform* m_box;

2
src/gui/race_gui.cpp
View File

@ -103,7 +103,7 @@ void RaceGUI::UpdateKeyboardMappings()
{
PlayerKart* kart = world->getPlayerKart(i);
for(int ka=(int) KC_LEFT;ka< (int) KC_LAST+1;ka++)
for(int ka=(int)KC_FIRST; ka < (int)KC_LAST+1; ka++)
putEntry(kart, (KartActions) ka);
}

8
src/player.hpp
View File

@ -36,9 +36,8 @@ typedef struct
}
Input;
// Some part (e.g. gui/PlayerControls) depend on KC_LEFT being the first
// entry, and KC_FIRE being the last - so any action added should be
// added in between those two values.
//When adding any action at the beginning or at the end, remember to update
//the KC_FIRST and/or KC_LAST constants.
enum KartActions { KC_LEFT,
KC_RIGHT,
KC_ACCEL,
@ -48,7 +47,8 @@ enum KartActions { KC_LEFT,
KC_RESCUE,
KC_FIRE,
KC_LOOK_BACK };
#define KC_LAST (KC_LOOK_BACK)
const int KC_FIRST = KC_LEFT;
const int KC_LAST = KC_LOOK_BACK;
extern const char *sKartAction2String[KC_LAST+1];
/*class for managing player name and control configuration*/