- oprava warnningov, ktore objavil scarabeus

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

8 files changed, 87 insertions, 54 deletions

diff --git a/src/base/arena.c b/src/base/arena.c
index 82c6c60..d8715e6 100644
--- a/src/base/arena.c
+++ b/src/base/arena.c
@@ -22,6 +22,29 @@
 static arena_t *currentArena;
 static int splitType;
 
+static int isBigArena(arena_t *arena)
+{
+	if( arena->w > WINDOW_SIZE_X || arena->h > WINDOW_SIZE_Y )
+	{
+		return 1;
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+static int isTuxNear(tux_t *tux1, tux_t *tux2)
+{
+	if( abs(tux1->x - tux2->x) < WINDOW_SIZE_X &&
+	    abs(tux1->y - tux2->y) < WINDOW_SIZE_Y )
+	{
+		return 1;
+	}
+
+	return 0;
+}
+
 void setCurrentArena(arena_t *p)
 {
 	currentArena = p;
@@ -181,22 +204,33 @@ void getCenterScreen(int *screen_x, int *screen_y, int x, int y, int screen_size
 
 static void drawBackground(arena_t *arena, int screen_x, int screen_y)
 {
-	int i, j;
 
-	for( i = screen_y/arena->background->h ;
-	     i <= screen_y/arena->background->h + WINDOW_SIZE_Y/arena->background->h+1 ; i++ )
+	if( isBigArena(arena) )
 	{
-		for( j = screen_x/arena->background->w ;
-		     j <= screen_x/arena->background->w + WINDOW_SIZE_X/arena->background->w+1 ; j++ )
+		int i, j;
+	
+		for( i = screen_y/arena->background->h ;
+		     i <= screen_y/arena->background->h + WINDOW_SIZE_Y/arena->background->h+1 ; i++ )
 		{
-			addLayer(arena->background,
-				j * arena->background->w,
-				i * arena->background->h,
-				0, 0, arena->background->w, arena->background->h, -100);
-
-			//count++;
+			for( j = screen_x/arena->background->w ;
+			     j <= screen_x/arena->background->w + WINDOW_SIZE_X/arena->background->w+1 ; j++ )
+			{
+				addLayer(arena->background,
+					j * arena->background->w,
+					i * arena->background->h,
+					0, 0, arena->background->w, arena->background->h, -100);
+	
+				//count++;
+			}
 		}
 	}
+	else
+	{
+		addLayer(arena->background,
+			0, 0,
+			0, 0,
+			arena->background->w, arena->background->h, -100);
+	}
 }
 
 static void action_drawTux(space_t *space, tux_t *tux, void *p)
@@ -240,6 +274,11 @@ static void drawSplitArenaForTux(arena_t *arena, tux_t *tux, int location_x, int
 		case SCREEN_SPLIT_VERTICAL :
 			getCenterScreen(&screen_x, &screen_y, tux->x, tux->y, WINDOW_SIZE_X/2, WINDOW_SIZE_Y);
 		break;
+		default :
+			screen_x = -1;
+			screen_y = -1;
+			assert( ! "stupd error ");
+		break;
 	}
 
 	drawBackground(arena, screen_x, screen_y);
@@ -253,6 +292,11 @@ static void drawSplitArenaForTux(arena_t *arena, tux_t *tux, int location_x, int
 		case SCREEN_SPLIT_VERTICAL :
 			drawLayerSplit(location_x, location_y, screen_x, screen_y, WINDOW_SIZE_X/2, WINDOW_SIZE_Y);
 		break;
+		default :
+			screen_x = -1;
+			screen_y = -1;
+			assert( ! "stupd error ");
+		break;
 	}
 }
 
@@ -313,29 +357,6 @@ void drawSimpleArena(arena_t *arena)
 	drawLayer(tux->x, tux->y);
 }
 
-static int isBigArena(arena_t *arena)
-{
-	if( arena->w > WINDOW_SIZE_X || arena->h > WINDOW_SIZE_Y )
-	{
-		return 1;
-	}
-	else
-	{
-		return 0;
-	}
-}
-
-static int isTuxNear(tux_t *tux1, tux_t *tux2)
-{
-	if( abs(tux1->x - tux2->x) < WINDOW_SIZE_X &&
-	    abs(tux1->y - tux2->y) < WINDOW_SIZE_Y )
-	{
-		return 1;
-	}
-
-	return 0;
-}
-
 void drawArena(arena_t *arena)
 {
 	if( isBigArena(arena) && 
diff --git a/src/base/server.c b/src/base/server.c
index 1acdbac..c907dc0 100644
--- a/src/base/server.c
+++ b/src/base/server.c
@@ -318,7 +318,7 @@ void sendClient(client_t *p, char *msg)
 
 	if( p->status != NET_STATUS_ZOMBIE )
 	{
-		int ret;
+		int ret = -1; // no Warnnings
 
 #ifndef PUBLIC_SERVER
 		if( isParamFlag("--send") )
diff --git a/src/client/interface.c b/src/client/interface.c
index 0a0b005..5fb77c1 100755
--- a/src/client/interface.c
+++ b/src/client/interface.c
@@ -17,7 +17,7 @@ static SDL_Surface *screen;
 static SDL_TimerID timer;
 
 // window flags
-static Uint32 g_win_flags = SDL_SWSURFACE|SDL_DOUBLEBUF|SDL_ANYFORMAT;
+static Uint32 g_win_flags = SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_ANYFORMAT;
 
 static bool_t isInterfaceInit = FALSE;
 
diff --git a/src/client/interface.h b/src/client/interface.h
index 44ea2c8..3da0ba3 100755
--- a/src/client/interface.h
+++ b/src/client/interface.h
@@ -16,7 +16,7 @@
 #include <SDL_net.h>
 */
 
-#define SDL_SUBSYSTEMS SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_DOUBLEBUF
+#define SDL_SUBSYSTEMS SDL_INIT_VIDEO|SDL_INIT_TIMER
 
 // windows title
 #define WINDOW_TITLE "Tuxánci " TUXANCI_VERSION
diff --git a/src/client/layer.c b/src/client/layer.c
index 770a916..8e77ee4 100755
--- a/src/client/layer.c
+++ b/src/client/layer.c
@@ -99,6 +99,8 @@ void drawLayer()
 			this->w, this->h);
 	}
 
+	//printf("listLayer->count = %d\n", listLayer->count);
+
 	destroyListItem(listLayer, free);
 	listLayer = newList();
 }
diff --git a/src/client/screen.c b/src/client/screen.c
index 7f89faa..db08260 100644
--- a/src/client/screen.c
+++ b/src/client/screen.c
@@ -139,21 +139,30 @@ char* getScreen()
 
 void drawScreen()
 {
-	assert( currentScreen != NULL );
-
-#ifdef DEBUG_TIME_DRAW
-	my_time_t prev;
-
- 	prev = getMyTimeMicro();
-#endif
-
-	currentScreen->fce_draw();
+	static int count = 0;
 
-	interfaceRefresh();
+	count++;
 
-#ifdef DEBUG_TIME_DRAW
-	printf("c draw time = %d\n", getMyTimeMicro() - prev );
-#endif
+	if( count == 1 )
+	{
+		count = 0;
+
+		assert( currentScreen != NULL );
+	
+	#ifdef DEBUG_TIME_DRAW
+		my_time_t prev;
+	
+		prev = getMyTimeMicro();
+	#endif
+	
+		currentScreen->fce_draw();
+	
+		interfaceRefresh();
+	
+	#ifdef DEBUG_TIME_DRAW
+		printf("c draw time = %d\n", getMyTimeMicro() - prev );
+	#endif
+	}
 }
 
 
diff --git a/src/net/tcp.c b/src/net/tcp.c
index 766fdbe..aae5e3c 100755
--- a/src/net/tcp.c
+++ b/src/net/tcp.c
@@ -48,10 +48,10 @@ sock_tcp_t* bindTcpSocket(char *address, int port, int proto)
 	assert( port > 0 && port < 65535 );
 
 	new = newSockTcp(proto);
+	ret = -1; // no Warnnings
 
 	assert( new != NULL );
 
-
 	if( new->proto == PROTO_TCPv4 )
 	{
 		new->sock = socket(AF_INET, SOCK_STREAM, 0);
@@ -198,6 +198,7 @@ sock_tcp_t* connectTcpSocket(char *ip, int port, int proto)
 	assert( port > 0 && port < 65535 );
 
 	new = newSockTcp(proto);
+	ret = -1; // no Warnnings
 
 	if( new->proto == PROTO_TCPv4 )
 	{
diff --git a/src/screen/screen_downArena.c b/src/screen/screen_downArena.c
index 00ab83a..d393250 100644
--- a/src/screen/screen_downArena.c
+++ b/src/screen/screen_downArena.c
@@ -212,7 +212,7 @@ static int eventRecvBuffer()
 	memset(buffer, 0, STR_PROTO_SIZE);
 
 	ret = readTcpSocket(sock_server_tcp, buffer, STR_PROTO_SIZE-1);
-	//printf("readTcpSocket = %d\n", ret);
+	//if( ret <= 0 )printf("readTcpSocket = %d\n", ret);
 
 	if( ret < 0 )
 	{
@@ -287,13 +287,13 @@ static void readArenaFromStatus()
 			closeUdpSocket(sock_server_udp);
 			sock_server_udp = NULL;
 			strncpy(arenaNetName, offset_begin, offset_end-offset_begin);
-
+/*
 			if( getArenaFileFormNetName(arenaNetName) != NULL )
 			{
 				setScreen("world");
 				return;
 			}
-
+*/
 			connectToDownServer();
 
 			//printf("arenaNetName = >>%s<<\n", arenaNetName);