added a mesh queue callback system (to allow mesh rendering things in different order...

[xonotic/darkplaces.git] / host_cmd.c

diff --git a/host_cmd.c b/host_cmd.c
index a97af9f6ff0b5f2267ed47a391c986a67c8f6613..1dec6eca1da66f36d5590bc3d6243f18aaac0009 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -30,19 +30,9 @@ Host_Quit_f
 ==================
 */
 
-// LordHavoc: didn't like it asking me if I wanted to quit
-//extern void M_Menu_Quit_f (void);
-
 extern qboolean host_shuttingdown;
 void Host_Quit_f (void)
 {
-       /*
-       if (key_dest != key_console && cls.state != ca_dedicated)
-       {
-               M_Menu_Quit_f ();
-               return;
-       }
-       */
        host_shuttingdown = true;
        CL_Disconnect ();
        Host_ShutdownServer(false);
@@ -78,7 +68,7 @@ void Host_Status_f (void)
                print = SV_ClientPrintf;
 
        print ("host:    %s\n", Cvar_VariableString ("hostname"));
-       print ("version: %s build %i\n", gamename, buildnumber);
+       print ("version: %s build %s\n", gamename, buildstring);
        if (tcpipAvailable)
                print ("tcp/ip:  %s\n", my_tcpip_address);
        if (ipxAvailable)
@@ -266,7 +256,7 @@ void Host_Map_f (void)
 
        cls.demonum = -1;               // stop demo loop in case this fails
 
-//     SCR_BeginLoadingPlaque ();
+       SCR_BeginLoadingPlaque ();
 
        CL_Disconnect ();
        Host_ShutdownServer(false);             
@@ -358,7 +348,7 @@ This is sent just before a server changes levels
 */
 void Host_Reconnect_f (void)
 {
-//     SCR_BeginLoadingPlaque ();
+       SCR_BeginLoadingPlaque ();
        cls.signon = 0;         // need new connection messages
 }
 
@@ -396,7 +386,7 @@ LOAD / SAVE GAME
 ===============
 Host_SavegameComment
 
-Writes a SAVEGAME_COMMENT_LENGTH character comment describing the current 
+Writes a SAVEGAME_COMMENT_LENGTH character comment describing the current
 ===============
 */
 void Host_SavegameComment (char *text)
@@ -461,7 +451,7 @@ void Host_Savegame_f (void)
                Con_Printf ("Relative pathnames are not allowed.\n");
                return;
        }
-               
+
        for (i=0 ; i<svs.maxclients ; i++)
        {
                if (svs.clients[i].active && (svs.clients[i].edict->v.health <= 0) )
@@ -473,7 +463,7 @@ void Host_Savegame_f (void)
 
        sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1));
        COM_DefaultExtension (name, ".sav");
-       
+
        Con_Printf ("Saving game to %s...\n", name);
        f = Qopen (name, "w");
        if (!f)
@@ -481,7 +471,7 @@ void Host_Savegame_f (void)
                Con_Printf ("ERROR: couldn't open.\n");
                return;
        }
-       
+
        Qprintf (f, "%i\n", SAVEGAME_VERSION);
        Host_SavegameComment (comment);
        Qprintf (f, "%s\n", comment);
@@ -548,11 +538,6 @@ void Host_Loadgame_f (void)
        sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1));
        COM_DefaultExtension (name, ".sav");
 
-       // LordHavoc: made SCR_UpdateScreen use a great deal less stack space, no longer an issue
-       //// we can't call SCR_BeginLoadingPlaque, because too much stack space has
-       //// been used.  The menu calls it before stuffing loadgame command
-//     SCR_BeginLoadingPlaque ();
-
        Con_Printf ("Loading game from %s...\n", name);
        f = Qopen (name, "rz");
        if (!f)
@@ -569,6 +554,9 @@ void Host_Loadgame_f (void)
                Con_Printf ("Savegame is version %i, not %i\n", version, SAVEGAME_VERSION);
                return;
        }
+
+       SCR_BeginLoadingPlaque ();
+
        str = Qgetline (f);
        for (i=0 ; i<NUM_SPAWN_PARMS ; i++) {
                str = Qgetline (f);
@@ -586,7 +574,7 @@ void Host_Loadgame_f (void)
        sscanf (str, "%f\n",&time);
 
        CL_Disconnect_f ();
-       
+
        SV_SpawnServer (mapname);
        if (!sv.active)
        {
@@ -682,11 +670,7 @@ void Host_Name_f (void)
                Con_Printf ("\"name\" is \"%s\"\n", cl_name.string);
                return;
        }
-       //if (Cmd_Argc () == 2)
-       //      newName = Cmd_Argv(1);
-       //else
-       //      newName = Cmd_Args();
-       //newName[15] = 0;
+
        if (Cmd_Argc () == 2)
                strncpy(newName, Cmd_Argv(1), 15);
        else
@@ -719,8 +703,7 @@ void Host_Name_f (void)
        
 void Host_Version_f (void)
 {
-       Con_Printf ("Version: %s build %i\n", gamename, buildnumber);
-       Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
+       Con_Printf ("Version: %s build %s\n", gamename, buildstring);
 }
 
 void Host_Say(qboolean teamonly)
@@ -898,7 +881,6 @@ void Host_Color_f(void)
                return;
        }
 
-       // void(float color) SV_ChangeTeam;
        if ((f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions)))
        {
                Con_DPrintf("Calling SV_ChangeTeam\n");
@@ -1125,7 +1107,6 @@ void Host_Spawn_f (void)
        MSG_WriteByte (&host_client->message, STAT_MONSTERS);
        MSG_WriteLong (&host_client->message, pr_global_struct->killed_monsters);
 
-//
 // send a fixangle
 // Never send a roll angle, because savegames can catch the server
 // in a state where it is expecting the client to correct the angle
@@ -1665,3 +1646,4 @@ void Host_InitCommands (void)
        Cmd_AddCommand ("viewnext", Host_Viewnext_f);
        Cmd_AddCommand ("viewprev", Host_Viewprev_f);
 }
+