Added setup

3 files changed, 10 insertions, 3 deletions

diff --git a/file.list b/file.list
index 0e859970..28615330 100644
--- a/file.list
+++ b/file.list
@@ -1,5 +1,5 @@
 OBJS =  src/sound/sound.o src/graphic/2xsai.o src/graphic/graphic.o
-OBJS += src/gui/chat.o src/gui/skill.o src/gui/shop.o src/gui/stats.o src/gui/npc.o
+OBJS += src/gui/chat.o src/gui/skill.o src/gui/shop.o src/gui/stats.o src/gui/npc.o src/gui/setup.o
 OBJS += src/gui/gui.o src/gui/login.o src/gui/char_server.o src/gui/char_select.o src/gui/inventory.o
 OBJS += src/net/network.o src/net/protocol.o
 OBJS += src/being.o src/game.o src/main.o src/map.o src/log.o src/astar.o
\ No newline at end of file
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) {
diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp
index 85dfa27c..880b2724 100644
--- a/src/graphic/graphic.cpp
+++ b/src/graphic/graphic.cpp
@@ -25,6 +25,7 @@
 
 #include "graphic.h"
 #include "2xsai.h"
+#include "../gui/setup.h"
 
 #define TILESET_W 480
 #define TILESET_H 320
@@ -217,6 +218,7 @@ void init_graphic() {
 	sell_player = init_dialog(sell_dialog, -1);
 	skill_list_player = init_dialog(skill_list_dialog, -1);
 	npc_list_player = init_dialog(npc_list_dialog, -1);
+	init_setup();
   //gui_bitmap = vpage[page_num];
 	alfont_text_mode(-1);
 	inventory.create(100, 100);
@@ -558,7 +560,7 @@ void do_graphic(void) {
 	// character status display
 	update_stats_dialog();
 	gui_update(stats_player);
-
+	update_setup();
 
 	
 	draw_sprite(vpage[page_num], mouse_sprite, mouse_x, mouse_y);