- partially fixed bug #0004 - *only* issue with text in buttons and textfields

- implemented build dir for normal game (=> not only server has build dir now)
- the directory structure was extended with directories for packaging scripts


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

4 files changed, 71 insertions, 63 deletions

diff --git a/src/Makefile b/src/Makefile
index 861529f..532132a 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,174 +6,178 @@ CC = gcc
 CFLAGS = -g -O0 -I../include -Wall `sdl-config --cflags`
 #CFLAGS = -O2 -DDESTDIR=\"$(DESTDIR)\" `sdl-config --cflags` -I../include -Wall
 
+BUILD_DIR = ../build
 LIBS = `sdl-config --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_net
 
 FILES = interface.o font.o list.o image.o layer.o director.o configFile.o tux.o main.o \
-	screen.o screen_world.o wall.o shot.o myTimer.o panel.o net_multiplayer.o  \
+	screen.o screen_world.o wall.o shot.o myTimer.o panel.o net_multiplayer.o \
 	buffer.o dynamicInt.o arena.o arenaFile.o textFile.o sound.o audio.o music.o gun.o \
 	item.o widget_label.o screen_mainMenu.o widget_button.o screen_analyze.o widget_textfield.o \
 	widget_check.o widget_image.o screen_setting.o screen_gameType.o screen_choiceArena.o \
 	widget_buttonimage.o screen_credits.o teleport.o pipe.o homeDirector.o screen_table.o \
 	sdl_udp.o proto.o server.o client.o term.o keytable.o language.o
  
-tuxanci-ng: $(FILES)
-	$(CC) $(CFLAGS) $(LIBS) -o tuxanci-ng $(FILES)
+tuxanci-ng: mkdir_build $(FILES)
+	$(CC) $(CFLAGS) $(LIBS) -o $(BUILD_DIR)/tuxanci-ng $(BUILD_DIR)/*.o
+
+mkdir_build:
+	mkdir -p $(BUILD_DIR)
 
 main.o: main.c 
-	$(CC) $(CFLAGS) -o main.o -c main.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/main.o -c main.c
 
 interface.o: interface.c ../include/interface.h
-	$(CC) $(CFLAGS) -o interface.o -c interface.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/interface.o -c interface.c
 
 font.o: font.c ../include/font.h
-	$(CC) $(CFLAGS) -o font.o -c font.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/font.o -c font.c
 
 list.o: list.c ../include/list.h
-	$(CC) $(CFLAGS) -o list.o -c list.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/list.o -c list.c
 
 image.o: image.c ../include/image.h
-	$(CC) $(CFLAGS) -o image.o -c image.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/image.o -c image.c
 
 layer.o: layer.c ../include/layer.h
-	$(CC) $(CFLAGS) -o layer.o -c layer.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/layer.o -c layer.c
 
 director.o: director.c ../include/director.h
-	$(CC) $(CFLAGS) -o director.o -c director.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/director.o -c director.c
 
 configFile.o: configFile.c ../include/configFile.h
-	$(CC) $(CFLAGS) -o configFile.o -c configFile.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/configFile.o -c configFile.c
 
 tux.o: tux.c ../include/tux.h
-	$(CC) $(CFLAGS) -o tux.o -c tux.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/tux.o -c tux.c
 
 screen.o: screen.c ../include/screen.h
-	$(CC) $(CFLAGS) -o screen.o -c screen.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen.o -c screen.c
 
 screen_world.o: screen_world.c ../include/screen_world.h
-	$(CC) $(CFLAGS) -o screen_world.o -c screen_world.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_world.o -c screen_world.c
 
 wall.o: wall.c ../include/wall.h
-	$(CC) $(CFLAGS) -o wall.o -c wall.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/wall.o -c wall.c
 
 shot.o: shot.c ../include/shot.h
-	$(CC) $(CFLAGS) -o shot.o -c shot.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/shot.o -c shot.c
 
 myTimer.o: myTimer.c ../include/myTimer.h
-	$(CC) $(CFLAGS) -o myTimer.o -c myTimer.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/myTimer.o -c myTimer.c
 
 panel.o: panel.c ../include/panel.h
-	$(CC) $(CFLAGS) -o panel.o -c panel.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/panel.o -c panel.c
 
 buffer.o: buffer.c ../include/buffer.h
-	$(CC) $(CFLAGS) -o buffer.o -c buffer.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/buffer.o -c buffer.c
 
 tcp.o: tcp.c ../include/tcp.h
-	$(CC) $(CFLAGS) -o tcp.o -c tcp.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/tcp.o -c tcp.c
 
 udp.o: udp.c ../include/udp.h
-	$(CC) $(CFLAGS) -o udp.o -c udp.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/udp.o -c udp.c
 
 sdl_udp.o: sdl_udp.c ../include/sdl_udp.h
-	$(CC) $(CFLAGS) -o sdl_udp.o -c sdl_udp.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/sdl_udp.o -c sdl_udp.c
 
 proto.o: proto.c ../include/proto.h
-	$(CC) $(CFLAGS) -o proto.o -c proto.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/proto.o -c proto.c
 
 server.o: server.c ../include/server.h
-	$(CC) $(CFLAGS) -o server.o -c server.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/server.o -c server.c
 
 client.o: client.c ../include/client.h
-	$(CC) $(CFLAGS) -o client.o -c client.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/client.o -c client.c
 
 network.o: network.c ../include/network.h
-	$(CC) $(CFLAGS) -o network.o -c network.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/network.o -c network.c
 
 net_multiplayer.o: net_multiplayer.c ../include/net_multiplayer.h
-	$(CC) $(CFLAGS) -o net_multiplayer.o -c net_multiplayer.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/net_multiplayer.o -c net_multiplayer.c
 
 dynamicInt.o: dynamicInt.c ../include/dynamicInt.h
-	$(CC) $(CFLAGS) -o dynamicInt.o -c dynamicInt.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/dynamicInt.o -c dynamicInt.c
 
 arena.o: arena.c ../include/arena.h
-	$(CC) $(CFLAGS) -o arena.o -c arena.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/arena.o -c arena.c
 
 textFile.o: textFile.c ../include/textFile.h
-	$(CC) $(CFLAGS) -o textFile.o -c textFile.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/textFile.o -c textFile.c
 
 arenaFile.o: arenaFile.c ../include/arenaFile.h
-	$(CC) $(CFLAGS) -o arenaFile.o -c arenaFile.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/arenaFile.o -c arenaFile.c
 
 audio.o: audio.c ../include/audio.h
-	$(CC) $(CFLAGS) -o audio.o -c audio.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/audio.o -c audio.c
 
 sound.o: sound.c ../include/sound.h
-	$(CC) $(CFLAGS) -o sound.o -c sound.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/sound.o -c sound.c
 
 music.o: music.c ../include/music.h
-	$(CC) $(CFLAGS) -o music.o -c music.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/music.o -c music.c
 
 gun.o: gun.c ../include/gun.h
-	$(CC) $(CFLAGS) -o gun.o -c gun.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/gun.o -c gun.c
 
 item.o: item.c ../include/item.h
-	$(CC) $(CFLAGS) -o item.o -c item.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/item.o -c item.c
 
 screen_mainMenu.o: screen_mainMenu.c ../include/screen_mainMenu.h
-	$(CC) $(CFLAGS) -o screen_mainMenu.o -c screen_mainMenu.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_mainMenu.o -c screen_mainMenu.c
 
 screen_analyze.o: screen_analyze.c ../include/screen_analyze.h
-	$(CC) $(CFLAGS) -o screen_analyze.o -c screen_analyze.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_analyze.o -c screen_analyze.c
 
 screen_setting.o: screen_setting.c ../include/screen_setting.h
-	$(CC) $(CFLAGS) -o screen_setting.o -c screen_setting.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_setting.o -c screen_setting.c
 
 screen_gameType.o: screen_gameType.c ../include/screen_gameType.h
-	$(CC) $(CFLAGS) -o screen_gameType.o -c screen_gameType.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_gameType.o -c screen_gameType.c
 
 screen_choiceArena.o: screen_choiceArena.c ../include/screen_choiceArena.h
-	$(CC) $(CFLAGS) -o screen_choiceArena.o -c screen_choiceArena.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_choiceArena.o -c screen_choiceArena.c
 
 screen_credits.o: screen_credits.c ../include/screen_credits.h
-	$(CC) $(CFLAGS) -o screen_credits.o -c screen_credits.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_credits.o -c screen_credits.c
 
 widget_label.o: widget_label.c ../include/widget_label.h
-	$(CC) $(CFLAGS) -o widget_label.o -c widget_label.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/widget_label.o -c widget_label.c
 
 widget_button.o: widget_button.c ../include/widget_button.h
-	$(CC) $(CFLAGS) -o widget_button.o -c widget_button.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/widget_button.o -c widget_button.c
 
 widget_buttonimage.o: widget_buttonimage.c ../include/widget_buttonimage.h
-	$(CC) $(CFLAGS) -o widget_buttonimage.o -c widget_buttonimage.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/widget_buttonimage.o -c widget_buttonimage.c
 
 widget_textfield.o: widget_textfield.c ../include/widget_textfield.h
-	$(CC) $(CFLAGS) -o widget_textfield.o -c widget_textfield.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/widget_textfield.o -c widget_textfield.c
 
 widget_check.o: widget_check.c ../include/widget_check.h
-	$(CC) $(CFLAGS) -o widget_check.o -c widget_check.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/widget_check.o -c widget_check.c
 
 widget_image.o: widget_image.c ../include/widget_image.h
-	$(CC) $(CFLAGS) -o widget_image.o -c widget_image.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/widget_image.o -c widget_image.c
 
 teleport.o: teleport.c ../include/teleport.h
-	$(CC) $(CFLAGS) -o teleport.o -c teleport.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/teleport.o -c teleport.c
 
 pipe.o: pipe.c ../include/pipe.h
-	$(CC) $(CFLAGS) -o pipe.o -c pipe.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/pipe.o -c pipe.c
 
 homeDirector.o: homeDirector.c ../include/homeDirector.h
-	$(CC) $(CFLAGS) -o homeDirector.o -c homeDirector.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/homeDirector.o -c homeDirector.c
 
 screen_table.o: screen_table.c ../include/screen_table.h
-	$(CC) $(CFLAGS) -o screen_table.o -c screen_table.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_table.o -c screen_table.c
 
 term.o: term.c ../include/term.h
-	$(CC) $(CFLAGS) -o term.o -c term.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/term.o -c term.c
 
 keytable.o: keytable.c ../include/keytable.h
-	$(CC) $(CFLAGS) -o keytable.o -c keytable.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/keytable.o -c keytable.c
 
 language.o: language.c ../include/language.h
-	$(CC) $(CFLAGS) -o language.o -c language.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/language.o -c language.c
 
 clean:
-	rm -rf *.o *.c~ ../include/*.h~ Makefile~ tuxanci-ng
+	rm -rf $(BUILD_DIR) *.c~ ../include/*.h~ Makefile~
diff --git a/src/Makefile-publicServer b/src/Makefile-publicServer
index 498372a..37e5c42 100755
--- a/src/Makefile-publicServer
+++ b/src/Makefile-publicServer
@@ -10,7 +10,7 @@ CFLAGS = -g -O0 -DPUBLIC_SERVER -DSUPPORT_NET_UNIX_UDP -I../include -Wall
 BUILD_DIR = ../build-server
 LIBS =
 
-FILES = list.o director.o configFile.o tux.o wall.o shot.o myTimer.o  \
+FILES = list.o director.o configFile.o tux.o wall.o shot.o myTimer.o \
 	buffer.o dynamicInt.o arena.o arenaFile.o textFile.o gun.o item.o teleport.o pipe.o \
 	udp.o proto.o server.o publicServer.o net_multiplayer.o serverConfigFile.o
 
diff --git a/src/widget_button.c b/src/widget_button.c
index cb9092b..2638619 100644
--- a/src/widget_button.c
+++ b/src/widget_button.c
@@ -49,7 +49,8 @@ void drawWidgetButton(widget_button_t *p)
 		drawImage(g_button0, p->x, p->y, 0, 0, g_button0->w, g_button0->h);
 	}
 
-	drawFont(p->text, p->x+WIDGET_BUTTON_WIDTH/2-p->w/2, p->y+p->h/2, COLOR_WHITE);
+	//drawFont(p->text, p->x+WIDGET_BUTTON_WIDTH/2-p->w/2, p->y+p->h/2, COLOR_WHITE);
+	drawFont(p->text, p->x + WIDGET_BUTTON_WIDTH/2 - p->w/2, p->y + WIDGET_BUTTON_HEIGHT/2 - p->h/2, COLOR_WHITE);
 }
 
 void eventWidgetButton(widget_button_t *p)
diff --git a/src/widget_textfield.c b/src/widget_textfield.c
index 8e8c229..fb3e902 100644
--- a/src/widget_textfield.c
+++ b/src/widget_textfield.c
@@ -60,7 +60,8 @@ static void drawText(widget_textfield_t *p)
 	if( p->timeBlick > WIDGET_TEXTFIELD_TIME_BLICK_CURSOR/2 &&
 	    p->active == TRUE )
 	{
-		strcat(str, ">");
+		//strcat(str, ">");
+		strcat(str, "\f");
 	}
 
 	p->timeBlick++;
@@ -70,7 +71,9 @@ static void drawText(widget_textfield_t *p)
 		p->timeBlick = 0;
 	}
 
-	drawFont(str, p->x+WIDGET_TEXTFIELD_TEXT_OFFSET_X, p->y+p->h/2, COLOR_WHITE);
+	//drawFont(str, p->x+WIDGET_TEXTFIELD_TEXT_OFFSET_X, p->y+p->h/2, COLOR_WHITE);
+	drawFont(str, p->x+WIDGET_TEXTFIELD_TEXT_OFFSET_X, p->y+WIDGET_TEXTFIELD_HEIGHT/2-p->h/2, COLOR_WHITE);
+	//printf("p->y: %d\nheight: %d\n p->h: %d\n", p->y, WIDGET_TEXTFIELD_HEIGHT, p->h);
 }
 
 void drawWidgetTextfield(widget_textfield_t *p)
@@ -99,7 +102,7 @@ static void readKey(widget_textfield_t *p)
 	mapa = SDL_GetKeyState(NULL);
 	len = strlen(p->text);
 
-	//mazanie posledneho klavesu
+	// mazanie posledneho klavesu
 	if( mapa[SDLK_BACKSPACE] == SDL_PRESSED )
 	{
 		if( len > 0 )
@@ -117,7 +120,7 @@ static void readKey(widget_textfield_t *p)
 		return;
 	}
 
-	//klavesy abecedy
+	// klavesy abecedy
 	for(i=SDLK_SPACE /*SDLK_a*/;i<=SDLK_z;i++)
 	{
 		//if(width<TEXTFIELD_SIZE_X-20 && mapa[i]==SDL_PRESSED)
@@ -143,7 +146,7 @@ static void readKey(widget_textfield_t *p)
 	{
 		if( mapa[i] == SDL_PRESSED && len < STR_SIZE )
 		{
-			 p->time = WIDGET_TEXTFIELD_TIME_READ_KEY;
+			p->time = WIDGET_TEXTFIELD_TIME_READ_KEY;
 			strcat( p->text, SDL_GetKeyName(i) );
 			getTextSize(p->text, &p->w, &p->h);
 			return;