]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - host_cmd.c
make dedicated work again
[xonotic/darkplaces.git] / host_cmd.c
index b34c09bcb03a71f66c44ec4a6d4eb40a0a786fd8..a97af9f6ff0b5f2267ed47a391c986a67c8f6613 100644 (file)
@@ -22,8 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 int    current_skill;
 
-void Mod_Print (void);
-
 dfunction_t *ED_FindFunction (char *name);
 
 /*
@@ -35,6 +33,7 @@ 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)
 {
        /*
@@ -44,8 +43,9 @@ void Host_Quit_f (void)
                return;
        }
        */
+       host_shuttingdown = true;
        CL_Disconnect ();
-       Host_ShutdownServer(false);             
+       Host_ShutdownServer(false);
 
        Sys_Quit ();
 }
@@ -64,7 +64,7 @@ void Host_Status_f (void)
        int                     hours = 0;
        int                     j;
        void            (*print) (char *fmt, ...);
-       
+
        if (cmd_source == src_command)
        {
                if (!sv.active)
@@ -78,7 +78,7 @@ void Host_Status_f (void)
                print = SV_ClientPrintf;
 
        print ("host:    %s\n", Cvar_VariableString ("hostname"));
-       print ("version: %4.2f (build %i)\n", VERSION, buildnumber);
+       print ("version: %s build %i\n", gamename, buildnumber);
        if (tcpipAvailable)
                print ("tcp/ip:  %s\n", my_tcpip_address);
        if (ipxAvailable)
@@ -375,10 +375,7 @@ void Host_Connect_f (void)
        
        cls.demonum = -1;               // stop demo loop in case this fails
        if (cls.demoplayback)
-       {
-               CL_StopPlayback ();
                CL_Disconnect ();
-       }
        strcpy (name, Cmd_Argv(1));
        CL_EstablishConnection (name);
        Host_Reconnect_f ();
@@ -516,6 +513,8 @@ void Host_Savegame_f (void)
 }
 
 
+extern mempool_t *edictstring_mempool;
+
 /*
 ===============
 Host_Loadgame_f
@@ -533,7 +532,7 @@ void Host_Loadgame_f (void)
        edict_t *ent;
        int             entnum;
        int             version;
-       float                   spawn_parms[NUM_SPAWN_PARMS];
+       float   spawn_parms[NUM_SPAWN_PARMS];
 
        if (cmd_source != src_command)
                return;
@@ -573,7 +572,7 @@ void Host_Loadgame_f (void)
        str = Qgetline (f);
        for (i=0 ; i<NUM_SPAWN_PARMS ; i++) {
                str = Qgetline (f);
-               sscanf (str, "%f", &spawn_parms[i]);
+               sscanf (str, "%f\n", &spawn_parms[i]);
        }
 // this silliness is so we can load 1.06 save files, which have float skill values
        str = Qgetline (f);
@@ -582,7 +581,6 @@ void Host_Loadgame_f (void)
        Cvar_SetValue ("skill", (float)current_skill);
 
        strcpy (mapname, Qgetline (f));
-       mapname[strlen (mapname) -1] = 0; // strip trailing \n
 
        str = Qgetline (f);
        sscanf (str, "%f\n",&time);
@@ -603,8 +601,7 @@ void Host_Loadgame_f (void)
        for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
        {
                str = Qgetline (f);
-               str[strlen (str) -1] = 0; // strip trailing \n
-               sv.lightstyles[i] = Hunk_AllocName (strlen(str)+1, "lightstyles");
+               sv.lightstyles[i] = Mem_Alloc(edictstring_mempool, strlen(str)+1);
                strcpy (sv.lightstyles[i], str);
        }
 
@@ -678,17 +675,22 @@ Host_Name_f
 */
 void Host_Name_f (void)
 {
-       char    *newName;
+       char newName[64];
 
        if (Cmd_Argc () == 1)
        {
                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)
-               newName = Cmd_Argv(1);  
+               strncpy(newName, Cmd_Argv(1), 15);
        else
-               newName = Cmd_Args();
+               strncpy(newName, Cmd_Args(), 15);
        newName[15] = 0;
 
        if (cmd_source == src_command)
@@ -717,7 +719,7 @@ void Host_Name_f (void)
        
 void Host_Version_f (void)
 {
-       Con_Printf ("Version %4.2f (build %i)\n", VERSION, buildnumber);
+       Con_Printf ("Version: %s build %i\n", gamename, buildnumber);
        Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
 }
 
@@ -775,7 +777,7 @@ void Host_Say(qboolean teamonly)
        {
                if (!client || !client->active || !client->spawned)
                        continue;
-               if (teamplay.value && teamonly && client->edict->v.team != save->edict->v.team)
+               if (teamplay.integer && teamonly && client->edict->v.team != save->edict->v.team)
                        continue;
                host_client = client;
                SV_ClientPrintf("%s", text);
@@ -864,7 +866,7 @@ void Host_Color_f(void)
        
        if (Cmd_Argc() == 1)
        {
-               Con_Printf ("\"color\" is \"%i %i\"\n", ((int)cl_color.value) >> 4, ((int)cl_color.value) & 0x0f);
+               Con_Printf ("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15);
                Con_Printf ("color <0-13> [0-13]\n");
                return;
        }
@@ -955,7 +957,7 @@ void Host_Pause_f (void)
                Cmd_ForwardToServer ();
                return;
        }
-       if (!pausable.value)
+       if (!pausable.integer)
                SV_ClientPrintf ("Pause not allowed.\n");
        else
        {
@@ -1277,58 +1279,58 @@ void Host_Give_f (void)
 
        t = Cmd_Argv(1);
        v = atoi (Cmd_Argv(2));
-       
+
        switch (t[0])
        {
-   case '0':
-   case '1':
-   case '2':
-   case '3':
-   case '4':
-   case '5':
-   case '6':
-   case '7':
-   case '8':
-   case '9':
-      // MED 01/04/97 added hipnotic give stuff
-      if (hipnotic)
-      {
-         if (t[0] == '6')
-         {
-            if (t[1] == 'a')
-               sv_player->v.items = (int)sv_player->v.items | HIT_PROXIMITY_GUN;
-            else
-               sv_player->v.items = (int)sv_player->v.items | IT_GRENADE_LAUNCHER;
-         }
-         else if (t[0] == '9')
-            sv_player->v.items = (int)sv_player->v.items | HIT_LASER_CANNON;
-         else if (t[0] == '0')
-            sv_player->v.items = (int)sv_player->v.items | HIT_MJOLNIR;
-         else if (t[0] >= '2')
-            sv_player->v.items = (int)sv_player->v.items | (IT_SHOTGUN << (t[0] - '2'));
-      }
-      else
-      {
-         if (t[0] >= '2')
-            sv_player->v.items = (int)sv_player->v.items | (IT_SHOTGUN << (t[0] - '2'));
-      }
+       case '0':
+       case '1':
+       case '2':
+       case '3':
+       case '4':
+       case '5':
+       case '6':
+       case '7':
+       case '8':
+       case '9':
+               // MED 01/04/97 added hipnotic give stuff
+               if (gamemode == GAME_HIPNOTIC)
+               {
+                       if (t[0] == '6')
+                       {
+                               if (t[1] == 'a')
+                               sv_player->v.items = (int)sv_player->v.items | HIT_PROXIMITY_GUN;
+                               else
+                               sv_player->v.items = (int)sv_player->v.items | IT_GRENADE_LAUNCHER;
+                       }
+                       else if (t[0] == '9')
+                               sv_player->v.items = (int)sv_player->v.items | HIT_LASER_CANNON;
+                       else if (t[0] == '0')
+                               sv_player->v.items = (int)sv_player->v.items | HIT_MJOLNIR;
+                       else if (t[0] >= '2')
+                               sv_player->v.items = (int)sv_player->v.items | (IT_SHOTGUN << (t[0] - '2'));
+               }
+               else
+               {
+                       if (t[0] >= '2')
+                               sv_player->v.items = (int)sv_player->v.items | (IT_SHOTGUN << (t[0] - '2'));
+               }
                break;
-       
-    case 's':
-               if (rogue)
+
+       case 's':
+               if (gamemode == GAME_ROGUE)
                {
-                   if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1)))
-                           val->_float = v;
+                       if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1)))
+                               val->_float = v;
                }
 
-        sv_player->v.ammo_shells = v;
-        break;         
-    case 'n':
-               if (rogue)
+               sv_player->v.ammo_shells = v;
+               break;
+       case 'n':
+               if (gamemode == GAME_ROGUE)
                {
-                   if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_nails1)))
+                       if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_nails1)))
                        {
-                           val->_float = v;
+                               val->_float = v;
                                if (sv_player->v.weapon <= IT_LIGHTNING)
                                        sv_player->v.ammo_nails = v;
                        }
@@ -1337,9 +1339,9 @@ void Host_Give_f (void)
                {
                        sv_player->v.ammo_nails = v;
                }
-        break;         
-    case 'l':
-               if (rogue)
+               break;
+       case 'l':
+               if (gamemode == GAME_ROGUE)
                {
                        val = GETEDICTFIELDVALUE(sv_player, eval_ammo_lava_nails);
                        if (val)
@@ -1349,9 +1351,9 @@ void Host_Give_f (void)
                                        sv_player->v.ammo_nails = v;
                        }
                }
-        break;
-    case 'r':
-               if (rogue)
+               break;
+       case 'r':
+               if (gamemode == GAME_ROGUE)
                {
                        val = GETEDICTFIELDVALUE(sv_player, eval_ammo_rockets1);
                        if (val)
@@ -1365,9 +1367,9 @@ void Host_Give_f (void)
                {
                        sv_player->v.ammo_rockets = v;
                }
-        break;         
-    case 'm':
-               if (rogue)
+               break;
+       case 'm':
+               if (gamemode == GAME_ROGUE)
                {
                        val = GETEDICTFIELDVALUE(sv_player, eval_ammo_multi_rockets);
                        if (val)
@@ -1377,12 +1379,12 @@ void Host_Give_f (void)
                                        sv_player->v.ammo_rockets = v;
                        }
                }
-        break;         
-    case 'h':
-        sv_player->v.health = v;
-        break;         
-    case 'c':
-               if (rogue)
+               break;
+       case 'h':
+               sv_player->v.health = v;
+               break;
+       case 'c':
+               if (gamemode == GAME_ROGUE)
                {
                        val = GETEDICTFIELDVALUE(sv_player, eval_ammo_cells1);
                        if (val)
@@ -1396,9 +1398,9 @@ void Host_Give_f (void)
                {
                        sv_player->v.ammo_cells = v;
                }
-        break;         
-    case 'p':
-               if (rogue)
+               break;
+       case 'p':
+               if (gamemode == GAME_ROGUE)
                {
                        val = GETEDICTFIELDVALUE(sv_player, eval_ammo_plasma);
                        if (val)
@@ -1408,15 +1410,15 @@ void Host_Give_f (void)
                                        sv_player->v.ammo_cells = v;
                        }
                }
-        break;         
-    }
+               break;
+       }
 }
 
 edict_t        *FindViewthing (void)
 {
        int             i;
        edict_t *e;
-       
+
        for (i=0 ; i<sv.num_edicts ; i++)
        {
                e = EDICT_NUM(i);
@@ -1441,7 +1443,7 @@ void Host_Viewmodel_f (void)
        if (!e)
                return;
 
-       m = Mod_ForName (Cmd_Argv(1), false);
+       m = Mod_ForName (Cmd_Argv(1), false, true, false);
        if (!m)
        {
                Con_Printf ("Can't load %s\n", Cmd_Argv(1));
@@ -1478,10 +1480,8 @@ void Host_Viewframe_f (void)
 
 void PrintFrameName (model_t *m, int frame)
 {
-       int data;
-       data = (int) Mod_Extradata(m);
-       if (m->ofs_scenes && data)
-               Con_Printf("frame %i: %s\n", frame, ((animscene_t *) (m->ofs_scenes + data))[frame].name);
+       if (m->animscenes)
+               Con_Printf("frame %i: %s\n", frame, m->animscenes[frame].name);
        else
                Con_Printf("frame %i\n", frame);
 }
@@ -1603,11 +1603,8 @@ Return to looping demos
 */
 void Host_Stopdemo_f (void)
 {
-       if (cls.state == ca_dedicated)
-               return;
        if (!cls.demoplayback)
                return;
-       CL_StopPlayback ();
        CL_Disconnect ();
 }
 
@@ -1622,7 +1619,7 @@ void Host_InitCommands (void)
 {
        Cmd_AddCommand ("status", Host_Status_f);
        Cmd_AddCommand ("quit", Host_Quit_f);
-       if (nehahra)
+       if (gamemode == GAME_NEHAHRA)
        {
                Cmd_AddCommand ("max", Host_God_f);
                Cmd_AddCommand ("monster", Host_Notarget_f);
@@ -1667,6 +1664,4 @@ void Host_InitCommands (void)
        Cmd_AddCommand ("viewframe", Host_Viewframe_f);
        Cmd_AddCommand ("viewnext", Host_Viewnext_f);
        Cmd_AddCommand ("viewprev", Host_Viewprev_f);
-
-       Cmd_AddCommand ("mcache", Mod_Print);
 }