rnd-20060819-2-src

[rocksndiamonds.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index 1733aba93441a77d164937e9bccee05a7257f0d5..6f1855c17a0594998db4dac2964a0fc58afb4c58 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -431,18 +431,11 @@ static void Handle_OP_NUMBER_WANTED()
   }
   else if (old_client_nr == first_player.nr)   /* failed -- local player? */
   {
-#if 0
-    char *color[] = { "yellow", "red", "green", "blue" };
-#endif
     char request[100];
 
-#if 1
     sprintf(request, "Sorry ! Player %d already exists ! You are player %d !",
            index_nr_wanted + 1, new_index_nr + 1);
-#else
-    sprintf(request, "Sorry ! %s player still exists ! You are %s player !",
-           color[index_nr_wanted], color[new_index_nr]);
-#endif
+
     Request(request, REQ_CONFIRM);
 
     Error(ERR_NETWORK_CLIENT, "cannot switch -- you keep client # %d",
@@ -602,16 +595,11 @@ static void Handle_OP_MOVE_PLAYER(unsigned int len)
     Error(ERR_RETURN, "client and servers frame counters out of sync");
     Error(ERR_RETURN, "frame counter of client is %d", FrameCounter);
     Error(ERR_RETURN, "frame counter of server is %d", server_frame_counter);
-
-#if 1
     Error(ERR_RETURN, "this should not happen -- please debug");
 
     stop_network_game = TRUE;
 
     return;
-#else
-    Error(ERR_EXIT,   "this should not happen -- please debug");
-#endif
   }
 
   /* copy valid player actions */