summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.h3
-rw-r--r--src/client.c4
-rw-r--r--src/item.c5
-rw-r--r--src/screen_world.c1
4 files changed, 8 insertions, 5 deletions
diff --git a/config.h b/config.h
index e4c09a2..aa8c687 100644
--- a/config.h
+++ b/config.h
@@ -1,3 +1,4 @@
+
/*
#define DEBUG_SERVER_SEND
#define DEBUG_SERVER_RECV
@@ -5,7 +6,7 @@
#define DEBUG_CLIENT_RECV
*/
-#define TUXANCI_NG_VERSION "svn33"
+#define TUXANCI_NG_VERSION "svn37"
#define DESTDIR "/usr/local/"
#define SUPPORT_NET_SDL_UDP
diff --git a/src/client.c b/src/client.c
index 8e5aae3..f942b60 100644
--- a/src/client.c
+++ b/src/client.c
@@ -202,9 +202,9 @@ void eventServerBuffer()
while ( getBufferLine(clientBuffer, line, STR_PROTO_SIZE) >= 0 )
{
-#ifdef DEBUG_CLIENT_RECV
+//#ifdef DEBUG_CLIENT_RECV
printf("recv server msg->%s", line);
-#endif
+//#endif
if( strncmp(line, "error", 5) == 0 )proto_recv_error_client(line);
if( strncmp(line, "init", 4) == 0 )proto_recv_init_client(line);
if( strncmp(line, "event", 5) == 0 )proto_recv_event_client(line);
diff --git a/src/item.c b/src/item.c
index 77f2ffd..a84b97b 100644
--- a/src/item.c
+++ b/src/item.c
@@ -536,7 +536,10 @@ void eventGiveTuxListItem(tux_t *tux, list_t *listItem)
if( conflictSpace(x, y, w, h, thisItem->x, thisItem->y, thisItem->w, thisItem->h) )
{
- proto_send_item_server(PROTO_SEND_ALL, NULL, tux, thisItem);
+ if( getNetTypeGame() == NET_GAME_TYPE_SERVER )
+ {
+ proto_send_item_server(PROTO_SEND_ALL, NULL, tux, thisItem);
+ }
if( eventGiveTuxItem(tux, listItem, thisItem) >= 0 )
{
diff --git a/src/screen_world.c b/src/screen_world.c
index f61677f..ebaaa20 100644
--- a/src/screen_world.c
+++ b/src/screen_world.c
@@ -93,7 +93,6 @@ void countRoundInc()
}
count++;
- printf("count = %d\n", count);
if( count >= max_count )
{