summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorMateusz Kaduk <mateusz.kaduk@gmail.com>2004-12-01 23:30:11 +0000
committerMateusz Kaduk <mateusz.kaduk@gmail.com>2004-12-01 23:30:11 +0000
commit4c03aa013fa6ffae784072bfef98330a569694a4 (patch)
treee7e8835c4960539475ef78c0b7205176f2f866c4 /src/game.cpp
parent712977897eedef54622039c1ae27f1dc9a237e93 (diff)
downloadmana-4c03aa013fa6ffae784072bfef98330a569694a4.tar.gz
mana-4c03aa013fa6ffae784072bfef98330a569694a4.tar.bz2
mana-4c03aa013fa6ffae784072bfef98330a569694a4.tar.xz
mana-4c03aa013fa6ffae784072bfef98330a569694a4.zip
Added setup
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 9d26add8..41c5065d 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -35,6 +35,7 @@
#include "./gui/inventory.h"
#include "./gui/shop.h"
#include "./gui/npc.h"
+#include "./gui/setup.h"
#include "./graphic/graphic.h"
#include "./sound/sound.h"
@@ -229,11 +230,15 @@ void do_input() {
action_time = false;
//alert("","","","","",0,0);
}
+
if(key[KEY_F10] && action_time==true) {
screen_mode = 1-(screen_mode-1)+1;
if(set_gfx_mode(screen_mode, 800, 600, 0, 0))
error(allegro_error);
- }
+ }
+
+ if(key[KEY_F11] && action_time==true)
+ show_player_setup = true;
if(key[KEY_ENTER]) {
if(strcmp(speech, "")!=0) {