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

Fixed crash when pressing F8 in main menu (#477),

Browse Source 
and some minor code cleanups.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10022 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2011-10-20 02:23:47 +00:00
parent 492b58f8ce
commit 22bde657f8
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/input/input_manager.cpp
View File

@ -102,7 +102,7 @@ void InputManager::handleStaticAction(int key, int value)
case KEY_KEY_8: case KEY_KEY_8:
case KEY_KEY_9: case KEY_KEY_9:
{ {
if(!ProfileWorld::isProfileMode()) break; if(!ProfileWorld::isProfileMode() || !world) break;
int kart_id = key - KEY_KEY_1; int kart_id = key - KEY_KEY_1;
if(kart_id<0 || kart_id>=(int)world->getNumKarts()) break; if(kart_id<0 || kart_id>=(int)world->getNumKarts()) break;
for(unsigned int i=0; i<world->getNumKarts(); i++) for(unsigned int i=0; i<world->getNumKarts(); i++)
@ -125,7 +125,7 @@ void InputManager::handleStaticAction(int key, int value)
case KEY_KEY_I: case KEY_KEY_I:
{ {
if (world == NULL || !UserConfigParams::m_artist_debug_mode) break; if (!world || !UserConfigParams::m_artist_debug_mode) break;
Kart* kart = world->getLocalPlayerKart(0); Kart* kart = world->getLocalPlayerKart(0);
if (kart == NULL) break; if (kart == NULL) break;
@ -135,7 +135,7 @@ void InputManager::handleStaticAction(int key, int value)
} }
case KEY_KEY_K: case KEY_KEY_K:
{ {
if (world == NULL || !UserConfigParams::m_artist_debug_mode) break; if (!world || !UserConfigParams::m_artist_debug_mode) break;
Kart* kart = world->getLocalPlayerKart(0); Kart* kart = world->getLocalPlayerKart(0);
if (kart == NULL) break; if (kart == NULL) break;
@ -199,11 +199,11 @@ void InputManager::handleStaticAction(int key, int value)
break; break;
case KEY_F8: case KEY_F8:
if (UserConfigParams::m_artist_debug_mode && value) if (UserConfigParams::m_artist_debug_mode && value && world)
{ {
if (control_is_pressed) if (control_is_pressed)
{ {
RaceGUIBase* gui = World::getWorld()->getRaceGUI(); RaceGUIBase* gui = world->getRaceGUI();
if (gui != NULL) gui->m_enabled = !gui->m_enabled; if (gui != NULL) gui->m_enabled = !gui->m_enabled;
const int count = World::getWorld()->getNumKarts(); const int count = World::getWorld()->getNumKarts();
@ -239,12 +239,9 @@ void InputManager::handleStaticAction(int key, int value)
case KEY_F11: case KEY_F11:
if (UserConfigParams::m_artist_debug_mode && value && if (UserConfigParams::m_artist_debug_mode && value &&
control_is_pressed) control_is_pressed && world)
{ {
if (world != NULL) world->getPhysics()->nextDebugMode();
{
world->getPhysics()->nextDebugMode();
}
} }
break; break;
@ -255,8 +252,10 @@ void InputManager::handleStaticAction(int key, int value)
break; break;
case KEY_KEY_P: case KEY_KEY_P:
if (UserConfigParams::m_artist_debug_mode && value && control_is_pressed) if (UserConfigParams::m_artist_debug_mode && value &&
UserConfigParams::m_profiler_enabled = !UserConfigParams::m_profiler_enabled; control_is_pressed)
UserConfigParams::m_profiler_enabled =
!UserConfigParams::m_profiler_enabled;
break; break;
default: default:
break; break;