fix another float->enum conversion error with g++ 4

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index c6b493c9bed114b7f2b71c90771d0642201c818f..97b51e240bf6fd5e8c9ca56f24f974abcd99e304 100644 (file)
--- a/host.c
+++ b/host.c
@@ -176,7 +176,7 @@ void Host_ServerOptions (void)
                if (i && i + 1 < com_argc && atoi (com_argv[i+1]) >= 1)
                        svs.maxclients = atoi (com_argv[i+1]);
                if (COM_CheckParm ("-listen"))
-                       Sys_Error ("Only one of -dedicated or -listen can be specified");
+                       Con_Printf ("Only one of -dedicated or -listen can be specified");
                // default sv_public on for dedicated servers (often hosted by serious administrators), off for listen servers (often hosted by clueless users)
                Cvar_SetValue("sv_public", 1);
        }
@@ -201,7 +201,7 @@ void Host_ServerOptions (void)
 
        svs.maxclients = bound(1, svs.maxclients, MAX_SCOREBOARD);
 
-       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 (svs.maxclients > 1 && !deathmatch.integer)
                Cvar_SetValueQuick(&deathmatch, 1);
@@ -477,7 +477,7 @@ void Host_ShutdownServer(qboolean crash)
 {
        int i, count;
        sizebuf_t buf;
-       char message[4];
+       qbyte message[4];
 
        Con_DPrintf("Host_ShutdownServer\n");
 
@@ -512,8 +512,6 @@ void Host_ShutdownServer(qboolean crash)
        memset(&sv, 0, sizeof(sv));
        memset(svs.clients, 0, svs.maxclients*sizeof(client_t));
 
-       PRVM_ResetProg();
-
        SV_VM_End();
 }
 
@@ -868,7 +866,6 @@ void Host_StartVideo(void)
                vid_opened = true;
                VID_Start();
                CDAudio_Startup();
-               CL_InitTEnts();  // We must wait after sound startup to load tent sounds
        }
 }