summaryrefslogtreecommitdiff
path: root/src/proto.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/proto.c')
-rw-r--r--src/proto.c49
1 files changed, 24 insertions, 25 deletions
diff --git a/src/proto.c b/src/proto.c
index bb1a14c..a646d9c 100644
--- a/src/proto.c
+++ b/src/proto.c
@@ -271,8 +271,8 @@ void proto_send_newtux_server(int type, client_t *client, tux_t *tux)
if( tux->bonus == BONUS_HIDDEN )
{
- x = -100;
- y = -100;
+ x = TUX_LOCATE_UNKNOWN;
+ y = TUX_LOCATE_UNKNOWN;
}
else
{
@@ -607,7 +607,6 @@ void proto_recv_shot_client(char *msg)
if( shot->gun == GUN_LASSER )
{
- printf("transform\n");
transformOnlyLasser(shot);
}
@@ -621,7 +620,7 @@ void proto_recv_shot_client(char *msg)
void proto_send_ping_client()
{
char msg[STR_PROTO_SIZE];
- strcpy(msg, "ping\n");
+ sprintf(msg, "ping\n");
sendServer(msg);
}
@@ -631,29 +630,10 @@ void proto_recv_ping_server(client_t *client, char *msg)
{
}
-#ifndef PUBLIC_SERVER
-
-void proto_send_end_client()
-{
- char msg[STR_PROTO_SIZE];
- strcpy(msg, "end\n");
- sendServer(msg);
-}
-
-#endif
-
-void proto_recv_end_server(client_t *client, char *msg)
-{
- assert( msg != NULL );
- assert( client != NULL );
-
- client->status = NET_STATUS_ZOMBIE;
-}
-
void proto_send_ping_server(int type, client_t *client)
{
char msg[STR_PROTO_SIZE];
- strcpy(msg, "ping\n");
+ sprintf(msg, "ping\n");
proto_send(type, client, msg);
}
@@ -672,7 +652,6 @@ void proto_send_end_server(int type, client_t *client)
proto_send(type, client, msg);
}
-
#ifndef PUBLIC_SERVER
void proto_recv_end_client(char *msg)
@@ -683,3 +662,23 @@ void proto_recv_end_client(char *msg)
}
#endif
+
+#ifndef PUBLIC_SERVER
+
+void proto_send_end_client()
+{
+ char msg[STR_PROTO_SIZE];
+ strcpy(msg, "end\n");
+ sendServer(msg);
+}
+
+#endif
+
+void proto_recv_end_server(client_t *client, char *msg)
+{
+ assert( msg != NULL );
+ assert( client != NULL );
+
+ client->status = NET_STATUS_ZOMBIE;
+}
+