some cleanup of Mod_Alias_GetMesh_Vertex3f

[xonotic/darkplaces.git] / host_cmd.c

diff --git a/host_cmd.c b/host_cmd.c
index 01ab25729600d1930f1cf3deb5e6263adb2a87b7..a1c427b714b404f7d8ff168b0a0baf3f30bc9a03 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -271,9 +271,8 @@ void Host_Map_f (void)
        CL_Disconnect ();
        Host_ShutdownServer();
 
-       // remove console or menu
+       // remove menu
        key_dest = key_game;
-       key_consoleactive = 0;
 
        svs.serverflags = 0;                    // haven't completed an episode yet
        allowcheats = sv_cheats.integer != 0;
@@ -333,9 +332,8 @@ void Host_Changelevel_f (void)
        if (cmd_source != src_command)
                return;
 
-       // remove console or menu
+       // remove menu
        key_dest = key_game;
-       key_consoleactive = 0;
 
        SV_VM_Begin();
        SV_SaveSpawnparms ();
@@ -371,9 +369,8 @@ void Host_Restart_f (void)
        if (cmd_source != src_command)
                return;
 
-       // remove console or menu
+       // remove menu
        key_dest = key_game;
-       key_consoleactive = 0;
 
        allowcheats = sv_cheats.integer != 0;
        strcpy(mapname, sv.name);
@@ -1424,19 +1421,19 @@ void Host_Spawn_f (void)
        // send some stats
        MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
        MSG_WriteByte (&host_client->netconnection->message, STAT_TOTALSECRETS);
-       MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->total_secrets);
+       MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->total_secrets);
 
        MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
        MSG_WriteByte (&host_client->netconnection->message, STAT_TOTALMONSTERS);
-       MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->total_monsters);
+       MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->total_monsters);
 
        MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
        MSG_WriteByte (&host_client->netconnection->message, STAT_SECRETS);
-       MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->found_secrets);
+       MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->found_secrets);
 
        MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
        MSG_WriteByte (&host_client->netconnection->message, STAT_MONSTERS);
-       MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->killed_monsters);
+       MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->killed_monsters);
 
        // send a fixangle
        // Never send a roll angle, because savegames can catch the server
@@ -1507,7 +1504,7 @@ void Host_Kick_f (void)
 
        if (Cmd_Argc() > 2 && strcmp(Cmd_Argv(1), "#") == 0)
        {
-               i = atof(Cmd_Argv(2)) - 1;
+               i = (int)(atof(Cmd_Argv(2)) - 1);
                if (i < 0 || i >= svs.maxclients || !(host_client = svs.clients + i)->active)
                        return;
                byNumber = true;
@@ -1835,7 +1832,7 @@ void Host_Viewnext_f (void)
        if (e->fields.server->frame >= m->numframes)
                e->fields.server->frame = m->numframes - 1;
 
-       PrintFrameName (m, e->fields.server->frame);
+       PrintFrameName (m, (int)e->fields.server->frame);
 }
 
 /*
@@ -1863,7 +1860,7 @@ void Host_Viewprev_f (void)
        if (e->fields.server->frame < 0)
                e->fields.server->frame = 0;
 
-       PrintFrameName (m, e->fields.server->frame);
+       PrintFrameName (m, (int)e->fields.server->frame);
 }
 
 /*