diff options
| -rw-r--r-- | src/game.cpp | 2 | ||||
| -rw-r--r-- | src/gui/setup.cpp | 3 | ||||
| -rw-r--r-- | src/keyboardconfig.cpp | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/game.cpp b/src/game.cpp index 6e513eec..e04a5ee8 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -347,11 +347,11 @@ Game::~Game() destroyGuiWindows(); delete beingManager; + delete player_node; delete floorItemManager; delete joystick; delete particleEngine; delete engine; - delete player_node; beingManager = NULL; floorItemManager = NULL; diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 8062ac06..68bc3a4b 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -67,12 +67,9 @@ Setup::Setup(): // Store this button, as it needs to be enabled/disabled if (!strcmp(*curBtn, "Reset Windows")) { mResetWindows = btn; - printf("!\n"); } } - if (mResetWindows) printf("!\n"); - TabbedArea *panel = new TabbedArea; panel->setDimension(gcn::Rectangle(5, 5, width - 10, height - 40)); diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index 73c0fe0a..06ce4ac7 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -197,6 +197,7 @@ int KeyboardConfig::getKeyEmoteOffset(int keyValue) const bool KeyboardConfig::isKeyActive(int index) { + if (!mActiveKeys) return false; return mActiveKeys[mKey[index].value]; } |