From e2cb2bfce3e4838b777310a03ad814b2aed68250 Mon Sep 17 00:00:00 2001 From: xHire Date: Sat, 4 Oct 2008 13:49:27 +0200 Subject: Development version was renamed form 'tuxanci-svn' to 'tuxanci-dev' Compilation warnings were cleaned up --- src/screen/screen_downArena.c | 92 ++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 58 deletions(-) (limited to 'src/screen') diff --git a/src/screen/screen_downArena.c b/src/screen/screen_downArena.c index d393250..f7534b5 100644 --- a/src/screen/screen_downArena.c +++ b/src/screen/screen_downArena.c @@ -1,5 +1,6 @@ #include +#include #include #include @@ -53,7 +54,7 @@ static void setStatusString(char *s) { //printf("status -> %s\n", s); destroyWidgetLabel(label_status); - label_status = newWidgetLabel(s, WINDOW_SIZE_X/2, 250, WIDGET_LABEL_CENTER); + label_status = newWidgetLabel(s, WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER); } static void connectToDownServer() @@ -63,8 +64,7 @@ static void connectToDownServer() sock_server_tcp = connectTcpSocket(getSettingIP(), getSettingPort(), PROTO_TCPv4); - if( sock_server_tcp == NULL ) - { + if (sock_server_tcp == NULL) { sprintf(status, "I do not connect to %s %d TCP down server", getSettingIP(), getSettingPort()); setStatusString(status); return; @@ -102,8 +102,7 @@ static void sendStatusToGameServer() { char *msg = "status\n"; - if( countSendMsg > DOWN_ARENA_MAX_SEND_MSG_STATUS ) - { + if (countSendMsg > DOWN_ARENA_MAX_SEND_MSG_STATUS) { char status[STR_SIZE]; sprintf(status, "Game server %s %d is down", getSettingIP(), getSettingPort()); setStatusString(status); @@ -114,8 +113,7 @@ static void sendStatusToGameServer() countSendMsg++; printf("countSendMsg = %d\n", countSendMsg++); - if( writeUdpSocket(sock_server_udp, sock_server_udp, msg, strlen(msg)) < 0 ) - { + if (writeUdpSocket(sock_server_udp, sock_server_udp, msg, strlen(msg)) < 0) { char status[STR_SIZE]; sprintf(status, "I do not send message to %s %d UDP game server", getSettingIP(), getSettingPort()); setStatusString(status); @@ -131,8 +129,7 @@ void startScreenDownArena() sock_server_udp = connectUdpSocket(getSettingIP(), getSettingPort(), PROTO_UDPv4); - if( sock_server_udp == NULL ) - { + if (sock_server_udp == NULL) { sprintf(status, "I do not connect to %s %d UDP game server", getSettingIP(), getSettingPort()); setStatusString(status); return; @@ -173,13 +170,11 @@ static void proto_err(char *line) static void eventProto(char *line) { - if( strncmp(line, "OK", 2) == 0 ) - { + if (strncmp(line, "OK", 2) == 0) { proto_ok(line); } - if( strncmp(line, "ERR", 3) == 0 ) - { + if (strncmp(line, "ERR", 3) == 0) { proto_err(line); } } @@ -212,15 +207,13 @@ static int eventRecvBuffer() memset(buffer, 0, STR_PROTO_SIZE); ret = readTcpSocket(sock_server_tcp, buffer, STR_PROTO_SIZE-1); - //if( ret <= 0 )printf("readTcpSocket = %d\n", ret); + //if (ret <= 0) printf("readTcpSocket = %d\n", ret); - if( ret < 0 ) - { + if (ret < 0) { return -1; } - if( addBuffer(recvBuffer, buffer, ret) < 0 ) - { + if (addBuffer(recvBuffer, buffer, ret) < 0) { char status[STR_SIZE]; sprintf(status, "Error -- recv buffer is full"); setStatusString(status); @@ -228,14 +221,12 @@ static int eventRecvBuffer() return -1; } - if( file == NULL && getBufferLine(recvBuffer, line, STR_PROTO_SIZE) >= 0 ) - { + if (file == NULL && getBufferLine(recvBuffer, line, STR_PROTO_SIZE) >= 0) { eventProto(line); return ret; } - if( file != NULL ) - { + if (file != NULL) { return downArenaFile(); } @@ -250,8 +241,7 @@ static int eventSendBuffer() len = getBufferSize(sendBuffer); - if( len == 0 ) - { + if (len == 0) { return -1; } @@ -259,8 +249,7 @@ static int eventSendBuffer() res = writeTcpSocket(sock_server_tcp, data, len); - if( res < 0 ) - { + if (res < 0) { return -1; } @@ -277,13 +266,11 @@ static void readArenaFromStatus() offset_begin = strstr(str_status, str_arena); - if( offset_begin != NULL ) - { + if (offset_begin != NULL) { offset_begin += strlen(str_arena); offset_end = strstr(offset_begin, "\n"); - if( offset_end != NULL ) - { + if (offset_end != NULL) { closeUdpSocket(sock_server_udp); sock_server_udp = NULL; strncpy(arenaNetName, offset_begin, offset_end-offset_begin); @@ -303,13 +290,11 @@ static void readArenaFromStatus() static void eventStatus() { - if( getMyTime() - timeSendMsg > DOWN_ARENA_MAX_TIEMOUT_LIMIT ) - { + if (getMyTime() - timeSendMsg > DOWN_ARENA_MAX_TIEMOUT_LIMIT) { sendStatusToGameServer(); } - if( readUdpSocket(sock_server_udp, sock_server_udp, str_status, STR_PROTO_SIZE-1) > 0 ) - { + if (readUdpSocket(sock_server_udp, sock_server_udp, str_status, STR_PROTO_SIZE - 1) > 0) { //printf("str_status = %s\n", str_status); readArenaFromStatus(); } @@ -319,29 +304,23 @@ void eventScreenDownArena() { int i; - if( strcmp(str_status, "none") == 0 ) - { + if (strcmp(str_status, "none") == 0) { eventStatus(); } - if( recvBuffer != NULL ) - { - for( i = 0 ; i < DOWN_ARENA_COUNT_READ_SOCKET ; i++ ) - { - if( eventRecvBuffer() <= 0 ) - { + if (recvBuffer != NULL) { + for (i = 0; i < DOWN_ARENA_COUNT_READ_SOCKET; i++) { + if (eventRecvBuffer() <= 0) { break; } } } - if( sendBuffer != NULL ) - { + if (sendBuffer != NULL) { eventSendBuffer(); } - if( file != NULL && fileSize == fileOffset && fileSize > 0 ) - { + if (file != NULL && fileSize == fileOffset && fileSize > 0) { fclose(file); file = NULL; closeConnectFromDownServer(); @@ -354,18 +333,15 @@ void eventScreenDownArena() void stopScreenDownArena() { - if( file != NULL ) - { + if (file != NULL) { unlink(path); } - if( sock_server_tcp != NULL ) - { + if (sock_server_tcp != NULL) { closeConnectFromDownServer(); } - if( sock_server_udp != NULL ) - { + if (sock_server_udp != NULL) { closeUdpSocket(sock_server_udp); } @@ -377,8 +353,7 @@ static void eventWidget(void *p) button = (widget_t *)(p); - if( button == button_back ) - { + if (button == button_back) { setScreen("mainMenu"); } } @@ -388,13 +363,13 @@ void initScreenDownArena() image_t *image; image = getImage(IMAGE_GROUP_BASE, "screen_main"); - image_backgorund = newWidgetImage(0, 0, image); + image_backgorund = newWidgetImage(0, 0, image); - button_back = newWidgetButton(_("back"), WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2, WINDOW_SIZE_Y-80, eventWidget); + button_back = newWidgetButton(_("back"), WINDOW_SIZE_X / 2 -WIDGET_BUTTON_WIDTH / 2, WINDOW_SIZE_Y - 80, eventWidget); - label_status = newWidgetLabel("none", WINDOW_SIZE_X/2, 250, WIDGET_LABEL_CENTER); + label_status = newWidgetLabel("none", WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER); - registerScreen( newScreen("downArena", startScreenDownArena, eventScreenDownArena, + registerScreen(newScreen("downArena", startScreenDownArena, eventScreenDownArena, drawScreenDownArena, stopScreenDownArena) ); } @@ -404,3 +379,4 @@ void quitScreenDownArena() destroyWidgetButton(button_back); destroyWidgetLabel(label_status); } + -- cgit v1.2.3