X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fnetwork.c;h=76b4e66fa9b9221876ca6eaa0c634237480159b2;hb=c878cb2be6a0bffee850bf4f2dcb1939d5d2cd4f;hp=3f51426c4102ae01f9032a1fab1b3368f0a9ab8e;hpb=c4b26cf489dcc65a00bfcc05f7898700d2f0c9e4;p=rocksndiamonds.git

diff --git a/src/network.c b/src/network.c
index 3f51426c..76b4e66f 100644
--- 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);
 }
@@ -324,7 +325,6 @@ static void Handle_OP_YOUR_NUMBER()
 
     *new_local_player = *old_local_player;
     old_local_player->connected = FALSE;
-    old_local_player->local = FALSE;
 
     local_player = new_local_player;
   }
@@ -373,7 +373,6 @@ static void Handle_OP_NUMBER_WANTED()
 
       *new_player = *old_player;
       old_player->connected = FALSE;
-      old_player->local = FALSE;
     }
 
     u = finduser(old_client_nr);
@@ -484,7 +483,10 @@ static void Handle_OP_START_PLAYING()
 
   leveldir_nr = new_leveldir_nr;
 
+  /*
   local_player->leveldir_nr = leveldir_nr;
+  */
+
 
   /*
   SaveLevelSetup();
@@ -499,14 +501,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();
 
 
@@ -576,7 +581,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;