merged NetConn_SendReliableMessage into NetConn_SendUnreliableMessage, and also merge...

[xonotic/darkplaces.git] / host_cmd.c

diff --git a/host_cmd.c b/host_cmd.c
index f5f5fcc44ba9cb47b6afc90d26499b3251e19fd0..5aae255e99fc3679dc74534547974477c1b2f7b6 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -301,16 +301,16 @@ void Host_Changelevel_f (void)
                Con_Print("changelevel <levelname> : continue game on a new level\n");
                return;
        }
                Con_Print("changelevel <levelname> : continue game on a new level\n");
                return;
        }

-       // HACKHACKHACK
-       if (!sv.active) {
-               Host_Map_f();
-               return;
-       }

        if (cls.demoplayback)
        {
                Con_Print("Only the server may changelevel\n");
                return;
        }
        if (cls.demoplayback)
        {
                Con_Print("Only the server may changelevel\n");
                return;
        }

+       // HACKHACKHACK
+       if (!sv.active) {
+               Host_Map_f();
+               return;
+       }

        if (cmd_source != src_command)
                return;
 
        if (cmd_source != src_command)
                return;
 


@@ -348,7 +348,7 @@ void Host_Restart_f (void)
                Con_Print("restart : restart current level\n");
                return;
        }
                Con_Print("restart : restart current level\n");
                return;
        }

-       if (!sv.active || cls.demoplayback)
+       if (!sv.active)

        {
                Con_Print("Only the server may restart\n");
                return;
        {
                Con_Print("Only the server may restart\n");
                return;


@@ -1280,7 +1280,6 @@ void Host_PreSpawn_f (void)
                MSG_WriteByte (&host_client->netconnection->message, svc_signonnum);
                MSG_WriteByte (&host_client->netconnection->message, 2);
        }
                MSG_WriteByte (&host_client->netconnection->message, svc_signonnum);
                MSG_WriteByte (&host_client->netconnection->message, 2);
        }

-       host_client->sendsignon = true;

 
        // reset the name change timer because the client will send name soon
        host_client->nametime = 0;
 
        // reset the name change timer because the client will send name soon
        host_client->nametime = 0;


@@ -1421,8 +1420,6 @@ void Host_Spawn_f (void)
 
        MSG_WriteByte (&host_client->netconnection->message, svc_signonnum);
        MSG_WriteByte (&host_client->netconnection->message, 3);
 
        MSG_WriteByte (&host_client->netconnection->message, svc_signonnum);
        MSG_WriteByte (&host_client->netconnection->message, 3);

-
-       host_client->sendsignon = true;

 }
 
 /*
 }
 
 /*