rnd-19981123-4

[rocksndiamonds.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index 6ddf52b280b83bc1afa73aea69112c0d41109610..8af730753e7f2a892db2c083c76cc81a8d20fe8f 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -226,10 +226,11 @@ boolean ConnectToServer(char *host, int port)
 void SendToServer_Nickname(char *nickname)
 {
   static char msgbuf[300];
+  int len_nickname = strlen(nickname);
 
   buf[1] = OP_NICKNAME;
-  memcpy(&buf[2], nickname, strlen(nickname));
-  sendbuf(2 + strlen(nickname));
+  memcpy(&buf[2], nickname, len_nickname);
+  sendbuf(2 + len_nickname);
   sprintf(msgbuf, "you set your nick to \"%s\"", nickname);
   sysmsg(msgbuf);
 }
@@ -237,9 +238,9 @@ void SendToServer_Nickname(char *nickname)
 void SendToServer_ProtocolVersion()
 {
   buf[1] = OP_PROTOCOL_VERSION;
-  buf[2] = PROT_VERS_1;
-  buf[3] = PROT_VERS_2;
-  buf[4] = PROT_VERS_3;
+  buf[2] = PROTOCOL_VERSION_1;
+  buf[3] = PROTOCOL_VERSION_2;
+  buf[4] = PROTOCOL_VERSION_3;
 
   sendbuf(5);
 }
@@ -305,7 +306,8 @@ static void Handle_OP_BAD_PROTOCOL_VERSION()
 {
   Error(ERR_WARN, "protocol version mismatch");
   Error(ERR_EXIT, "server expects %d.%d.x instead of %d.%d.%d",
-       buf[2], buf[3], PROT_VERS_1, PROT_VERS_2, PROT_VERS_3);
+       buf[2], buf[3],
+       PROTOCOL_VERSION_1, PROTOCOL_VERSION_2, PROTOCOL_VERSION_3);
 }
 
 static void Handle_OP_YOUR_NUMBER()
@@ -500,14 +502,17 @@ static void Handle_OP_START_PLAYING()
   level_nr = new_level_nr;
 
   TapeErase();
-  LoadLevelTape(level_nr);
+  LoadTape(level_nr);
 
+  /*
   GetPlayerConfig();
+  */
+
   LoadLevel(level_nr);
 
 
 
-  if (setup.autorecord_on)
+  if (setup.autorecord)
     TapeStartRecording();
 
 
@@ -577,7 +582,7 @@ static void Handle_OP_MOVE_FIGURE(unsigned int len)
 
   /* copy valid player actions */
   for (i=0; i<MAX_PLAYERS; i++)
-    stored_player[i].action =
+    stored_player[i].effective_action =
       (i < len - 6 && stored_player[i].active ? buf[6 + i] : 0);
 
   network_player_action_received = TRUE;