summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorYohann Ferreira <bertram@cegetel.net>2005-01-29 22:04:08 +0000
committerYohann Ferreira <bertram@cegetel.net>2005-01-29 22:04:08 +0000
commit5cbcbbfc0ff1db5cbbe9e187d067e3bd86fcce22 (patch)
tree6f14c1e411f1cf9efb82ff6c5ebeb25f35506b57 /src/game.cpp
parentbc79eeeb186e84388a5899b7cdd4a339aaa40495 (diff)
downloadmana-5cbcbbfc0ff1db5cbbe9e187d067e3bd86fcce22.tar.gz
mana-5cbcbbfc0ff1db5cbbe9e187d067e3bd86fcce22.tar.bz2
mana-5cbcbbfc0ff1db5cbbe9e187d067e3bd86fcce22.tar.xz
mana-5cbcbbfc0ff1db5cbbe9e187d067e3bd86fcce22.zip
*** empty log message ***
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 5cc75fa1..30d91e59 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -30,7 +30,6 @@
#include "./gui/inventory.h"
#include "./gui/shop.h"
#include "./gui/npc.h"
-#include "./gui/setup.h"
#include "./gui/stats.h"
#include "./gui/ok_dialog.h"
#include "./graphic/graphic.h"
@@ -49,7 +48,7 @@ int current_npc, server_tick;
extern unsigned char screen_mode;
int fps = 0, frame = 0;
-Setup *setup = NULL;
+//Setup *setupWindow = NULL;
OkDialog *deathNotice = NULL;
#define MAX_TIME 10000
@@ -218,6 +217,10 @@ void do_input()
skillDialog->setVisible(!skillDialog->isVisible());
used = true;
}
+ else if (keysym.sym == SDLK_c) {
+ setupWindow->setVisible(true);
+ used = true;
+ }
}
if (event.key.keysym.sym == SDLK_ESCAPE)