made darkplaces compile successfully with g++ to test for errors C doesn't care about...

[xonotic/darkplaces.git] / host_cmd.c

diff --git a/host_cmd.c b/host_cmd.c
index b3cd8a7f75b5e6221e8e2e505f22a2e750d35fd9..b98566f6cea337b98932e0a31f6f2563147f3eff 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -294,7 +294,12 @@ void Host_Changelevel_f (void)
                Con_Print("changelevel <levelname> : continue game on a new level\n");
                return;
        }
-       if (!sv.active || cls.demoplayback)
+       // HACKHACKHACK
+       if (!sv.active) {
+               Host_Map_f();
+               return;
+       }
+       if (cls.demoplayback)
        {
                Con_Print("Only the server may changelevel\n");
                return;
@@ -581,7 +586,7 @@ void Host_Loadgame_f (void)
 
        cls.demonum = -1;               // stop demo loop in case this fails
 
-       t = text = FS_LoadFile (filename, tempmempool, false);
+       t = text = (char *)FS_LoadFile (filename, tempmempool, false);
        if (!text)
        {
                Con_Print("ERROR: couldn't open.\n");
@@ -899,7 +904,7 @@ void Host_Say(qboolean teamonly)
        const char *p1;
        char *p2;
        // LordHavoc: 256 char say messages
-       unsigned char text[256];
+       char text[256];
        qboolean fromServer = false;
 
        if (cmd_source == src_command)
@@ -1186,6 +1191,7 @@ void Host_Pause_f (void)
 ======================
 Host_PModel_f
 LordHavoc: only supported for Nehahra, I personally think this is dumb, but Mindcrime won't listen.
+LordHavoc: correction, Mindcrime will be removing pmodel in the future, but it's still stuck here for compatibility.
 ======================
 */
 cvar_t cl_pmodel = {CVAR_SAVE, "_cl_pmodel", "0"};
@@ -1882,7 +1888,7 @@ static void MaxPlayers_f(void)
        if (svs.clients)
                Mem_Free(svs.clients);
        svs.maxclients = n;
-       svs.clients = Mem_Alloc(sv_mempool, sizeof(client_t) * svs.maxclients);
+       svs.clients = (client_t *)Mem_Alloc(sv_mempool, sizeof(client_t) * svs.maxclients);
        if (n == 1)
                Cvar_Set ("deathmatch", "0");
        else