- screen na vyberanie aren

- areny z povodnych tuxancov boli prescriptovane do tuxanci-ng, treba este dopisat teleporty a rury



git-svn-id: http://opensvn.csie.org/tuxanci_ng@7 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

7 files changed, 58 insertions, 10 deletions

diff --git a/include/arenaFile.h b/include/arenaFile.h
index 47d9586..f838c6a 100644
--- a/include/arenaFile.h
+++ b/include/arenaFile.h
@@ -8,6 +8,11 @@
 
 extern bool_t isArenaFileInicialized();
 extern void initArenaFile();
+extern int getArenaCount();
+extern char *getArenaName(int id);
+extern char *getArenaNetName(int id);
+extern int getArenaIdFormNetName(char *s);
+extern char *getArenaImage(int id);
 extern arena_t* getArena(int id);
 extern void quitArenaFile();
 
diff --git a/include/interface.h b/include/interface.h
index 3335ff1..858f295 100755
--- a/include/interface.h
+++ b/include/interface.h
@@ -35,6 +35,7 @@ extern int initSDL();
 extern SDL_Surface* getSDL_Screen();
 extern void getMousePosition(int *x, int *y);
 extern int isMouseClicked();
+extern void interfaceRefresh();
 extern void eventSDL();
 extern void quitSDL();
 
diff --git a/include/path.h b/include/path.h
index b48e3d4..11eeaee 100644
--- a/include/path.h
+++ b/include/path.h
@@ -3,16 +3,14 @@
 
 #define PATH_H
 
-//#define PATH_DIST_DIR "/usr/local/share/tuxanci-ng/"
+#define PATH_DIR	"share/tuxanci-ng/"
 
-#define PATH_DIST_DIR "/usr/share/tuxanci-ng/"
-
-#define PATH_IMAGE	PATH_DIST_DIR "image/"
-#define PATH_FONT	PATH_DIST_DIR "font/"
-#define PATH_ARENA	PATH_DIST_DIR "arena/"
-#define PATH_SOUND	PATH_DIST_DIR "sound/"
-#define PATH_MUSIC	PATH_DIST_DIR "music/"
-#define PATH_CONFIG	PATH_DIST_DIR "conf/"
-#define PATH_LANG	PATH_DIST_DIR "lang/"
+#define PATH_IMAGE	DISTDIR PATH_DIR "image/"
+#define PATH_FONT	DISTDIR PATH_DIR "font/"
+#define PATH_ARENA	DISTDIR PATH_DIR "arena/"
+#define PATH_SOUND	DISTDIR PATH_DIR "sound/"
+#define PATH_MUSIC	DISTDIR PATH_DIR "music/"
+#define PATH_CONFIG	DISTDIR PATH_DIR "conf/"
+#define PATH_LANG	DISTDIR PATH_DIR "lang/"
 
 #endif 
diff --git a/include/screen_choiceArena.h b/include/screen_choiceArena.h
new file mode 100644
index 0000000..0b10006
--- /dev/null
+++ b/include/screen_choiceArena.h
@@ -0,0 +1,15 @@
+
+#ifndef SCREEN_CHOICE_ARENA
+
+#define SCREEN_GAME_TYPE
+
+#define SCREENSHOT_ARENA_WIDTH		160
+#define SCREENSHOT_ARENA_HEIGHT		107
+
+extern void drawScreenChoiceArena();
+extern void eventScreenChoiceArena();
+extern int getChoiceArenaId();
+extern void initScreenChoiceArena();
+extern void quitScreenChoiceArena();
+
+#endif
diff --git a/include/screen_world.h b/include/screen_world.h
index 937e0a2..aa43968 100644
--- a/include/screen_world.h
+++ b/include/screen_world.h
@@ -12,7 +12,9 @@
 extern bool_t isScreenWorldInicialized();
 extern void initWorld();
 extern arena_t* getWorldArena();
+extern void setWorldArena(int id);
 extern void countRoundInc();
+extern void setMaxCountRound(int n);
 extern int conflictSpace(int x1,int y1,int w1,int h1,int x2,int y2,int w2,int h2);
 extern int isFreeSpace(int x, int y, int w, int h);
 extern void findFreeSpace(int *x, int *y, int w, int h);
diff --git a/include/widget_button.h b/include/widget_button.h
index 5fbcfb2..0787878 100644
--- a/include/widget_button.h
+++ b/include/widget_button.h
@@ -3,6 +3,8 @@
 
 #define WIDGET_BUTTON_H
 
+#define WIDGET_BUTTON_TIME	10
+
 #define WIDGET_BUTTON_WIDTH	125
 #define WIDGET_BUTTON_HEIGHT	36
 
diff --git a/include/widget_buttonimage.h b/include/widget_buttonimage.h
new file mode 100644
index 0000000..8b279ce
--- /dev/null
+++ b/include/widget_buttonimage.h
@@ -0,0 +1,25 @@
+
+#ifndef WIDGET_BUTTONIMAGE_H
+
+#define WIDGET_BUTTONIMAGE_H
+
+#define WIDGET_BUTTONIMAGE_TIME	10
+
+typedef struct widget_buttonimageimage
+{
+	int x, y;
+	int w, h;
+	int active;
+	SDL_Surface *image;
+	void (*fce_event)(void *);
+} widget_buttonimage_t;
+
+extern widget_buttonimage_t* newWidgetButtonimage(SDL_Surface *image, int x, int y,
+		void (*fce_event)(void *));
+
+extern void drawWidgetButtonimage(widget_buttonimage_t *p);
+extern void eventWidgetButtonimage(widget_buttonimage_t *p);
+extern void destroyWidgetButtonimage(widget_buttonimage_t *p);
+
+#endif
+