- oprava warnningov

- tux zomrie ked pri nom vybuchne bomba
- AI videt na radare
- server si nacitava konfiguraciu z /etc/tuxanci-ng-server/server.conf



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

10 files changed, 35 insertions, 15 deletions

diff --git a/src/base/arenaFile.c b/src/base/arenaFile.c
index 3493fe6..1ced97a 100644
--- a/src/base/arenaFile.c
+++ b/src/base/arenaFile.c
@@ -199,7 +199,7 @@ char *getArenaImage(int id)
 arena_t* getArena(int id)
 {
 	textFile_t *ts;
-	arena_t *arena;
+	arena_t *arena = NULL;  // no warninng
 	int i;
 
 	ts = (textFile_t *) listArenaFile->list[id];
diff --git a/src/base/path.h b/src/base/path.h
index b20c1f0..783fc6c 100644
--- a/src/base/path.h
+++ b/src/base/path.h
@@ -17,6 +17,8 @@
 #ifdef PUBLIC_SERVER
   #define PATH_DIR	PREFIX	"/share/tuxanci-ng-server/"
   #define PATH_MODULES	PREFIX	"/lib/tuxanci-ng-server/"
+  #define SERVER_CONFIG		"/etc/tuxanci-ng-server/server.conf"
+
 #endif
 
 #define PATH_IMAGE	PATH_DIR "image/"
diff --git a/src/base/shot.c b/src/base/shot.c
index 826bad4..e0d9dbf 100644
--- a/src/base/shot.c
+++ b/src/base/shot.c
@@ -187,7 +187,7 @@ void drawListShot(list_t *listShot)
 
 static int getRandomCourse(int x, int y)
 {
-	int ret;
+	int ret = -1; // no warnning
 
 	do{
 		switch( random() % 3 )
diff --git a/src/base/tux.c b/src/base/tux.c
index e954fec..5907a49 100644
--- a/src/base/tux.c
+++ b/src/base/tux.c
@@ -483,7 +483,7 @@ void eventConflictTuxWithShot(arena_t *arena)
 
 void moveTux(tux_t *tux, int n)
 {
-	int px, py;
+	int px = 0, py = 0;  // no warninng
 	int zal_x, zal_y;
 	int new_x, new_y;
 	int w, h;
@@ -756,7 +756,7 @@ void eventListTux(list_t *listTux)
 #endif
 		pickUpGun(thisTux);
 		eventBonus(thisTux);
-		//eventGiveTuxListItem(thisTux, arena->spaceItem);
+		eventGiveTuxListItem(thisTux, arena->spaceItem);
 	}
 }
 
diff --git a/src/client/chat.c b/src/client/chat.c
index d08a502..7d425dd 100644
--- a/src/client/chat.c
+++ b/src/client/chat.c
@@ -208,7 +208,6 @@ static void readKey()
 
 void eventChat()
 {
-	my_time_t currentTime;
 	Uint8 *mapa;
 	
 	mapa = SDL_GetKeyState(NULL);
diff --git a/src/modules/modPipe.c b/src/modules/modPipe.c
index 2c1a6e5..2ca2f17 100755
--- a/src/modules/modPipe.c
+++ b/src/modules/modPipe.c
@@ -218,7 +218,7 @@ static void moveShot(shot_t *shot, int position, int src_x, int src_y,
 	int dist_x, int dist_y, int dist_w, int dist_h)
 {
 	int offset = 0;
-	int new_x, new_y;
+	int new_x = 0, new_y = 0;  // no warninng
 
 	switch( shot->position )
 	{
@@ -341,6 +341,8 @@ static int negPosition(int n)
 			assert( ! "premenna n ma zlu hodnotu !" );
 		break;
 	}
+
+	return -1; // no warnning
 }
 
 int event()
diff --git a/src/modules/modTeleport.c b/src/modules/modTeleport.c
index 2b94e2f..0bc4c61 100755
--- a/src/modules/modTeleport.c
+++ b/src/modules/modTeleport.c
@@ -184,12 +184,13 @@ static int getRandomPosition()
 	}
 
 	assert( ! "Stupid error ! " );
+	return -1; // no warnning
 }
 
 static void teleportTux(tux_t *tux, teleport_t *teleport)
 {
 	teleport_t *distTeleport;
-	int dist_x, dist_y;
+	int dist_x = 0, dist_y = 0; // no warnning
 
 	if( tux->bonus == BONUS_GHOST ||
 	    export_fce->fce_getNetTypeGame() == NET_GAME_TYPE_CLIENT )
@@ -319,7 +320,7 @@ static void moveShot(shot_t *shot, int position, int src_x, int src_y,
 	int dist_x, int dist_y, int dist_w, int dist_h)
 {
 	int offset = 0;
-	int new_x, new_y;
+	int new_x = 0, new_y = 0; // no warnning
 
 	switch( shot->position )
 	{
diff --git a/src/net/udp.c b/src/net/udp.c
index 8a0623e..1438e4e 100644
--- a/src/net/udp.c
+++ b/src/net/udp.c
@@ -41,7 +41,7 @@ void destroySockUdp(sock_udp_t *p)
 sock_udp_t* bindUdpSocket(char *address, int port, int proto)
 {
 	sock_udp_t *new;
-	int res;
+	int res = -1; // no warninng
 
 	assert( port > 0 && port < 65535 );
 
@@ -167,7 +167,7 @@ int setUdpSockNonBlock(sock_udp_t *p)
 int readUdpSocket(sock_udp_t *src, sock_udp_t *dst, void *address, int len)
 {
 	int addrlen;
-	int size;
+	int size = -1;  // no warninng
 
 	assert( src != NULL );
 	assert( dst != NULL );
@@ -207,7 +207,7 @@ int readUdpSocket(sock_udp_t *src, sock_udp_t *dst, void *address, int len)
 int writeUdpSocket(sock_udp_t *src, sock_udp_t *dst, void *address, int len)
 {
 	int addrlen;
-	int size;
+	int size = -1;  // no warninng
 
 	assert( src != NULL );
 	assert( dst != NULL );
diff --git a/src/screen/screen_world.c b/src/screen/screen_world.c
index 1c0ad4a..16fffe8 100644
--- a/src/screen/screen_world.c
+++ b/src/screen/screen_world.c
@@ -449,6 +449,8 @@ void tuxControl(tux_t *p)
 
 void eventWorld()
 {
+	tux_t *thisTux;
+
 	if( arena == NULL )
 	{
 		eventNetMultiplayer();
@@ -462,11 +464,23 @@ void eventWorld()
 	eventArena(arena);
 	//eventModule();
 
-	addToRadar(tuxWithControlRightKeyboard->id,
-		tuxWithControlRightKeyboard->x,
-		tuxWithControlRightKeyboard->y,
+	thisTux = getControlTux(TUX_CONTROL_KEYBOARD_RIGHT);
+
+	addToRadar(thisTux->id,
+		thisTux->x,
+		thisTux->y,
 		RADAR_TYPE_YOU);
 
+	thisTux = getControlTux(TUX_CONTROL_KEYBOARD_LEFT);
+
+	if( thisTux != NULL )
+	{
+		addToRadar(thisTux->id,
+			thisTux->x,
+			thisTux->y,
+			RADAR_TYPE_YOU);
+	}
+
 	eventTerm();
 	eventEnd();
 	eventEsc();
diff --git a/src/server/serverConfigFile.c b/src/server/serverConfigFile.c
index 749bb2d..f50f2a9 100644
--- a/src/server/serverConfigFile.c
+++ b/src/server/serverConfigFile.c
@@ -37,7 +37,9 @@ static void prepareConfigFile(textFile_t *ts)
 
 void initServerConfigFile()
 {
-	serverTextFile = loadTextFile("./server.conf");
+	printf("load configuration form %s\n", SERVER_CONFIG);
+
+	serverTextFile = loadTextFile(SERVER_CONFIG);
 
 	if( serverTextFile == NULL )
 	{