host: Move out some client and server code

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index 584b38174a75ddd0b13c82900d77a42bdd4018ea..72b588eb39e3dc1e4d48c5930e3edc9a70ee2574 100644 (file)
--- a/host.c
+++ b/host.c
@@ -131,7 +131,6 @@ void Host_Error (const char *error, ...)
        PRVM_Crash(MVM_prog);
 #endif
 
-       cl.csqc_loaded = false;
        Cvar_SetValueQuick(&csqc_progcrc, -1);
        Cvar_SetValueQuick(&csqc_progsize, -1);
 
@@ -150,56 +149,6 @@ void Host_Error (const char *error, ...)
        Host_AbortCurrentFrame();
 }
 
-static void Host_ServerOptions (void)
-{
-       int i;
-
-       // general default
-       svs.maxclients = 8;
-
-// COMMANDLINEOPTION: Server: -dedicated [playerlimit] starts a dedicated server (with a command console), default playerlimit is 8
-// COMMANDLINEOPTION: Server: -listen [playerlimit] starts a multiplayer server with graphical client, like singleplayer but other players can connect, default playerlimit is 8
-       // if no client is in the executable or -dedicated is specified on
-       // commandline, start a dedicated server
-       i = Sys_CheckParm ("-dedicated");
-       if (i || !cl_available)
-       {
-               cls.state = ca_dedicated;
-               // check for -dedicated specifying how many players
-               if (i && i + 1 < sys.argc && atoi (sys.argv[i+1]) >= 1)
-                       svs.maxclients = atoi (sys.argv[i+1]);
-               if (Sys_CheckParm ("-listen"))
-                       Con_Printf ("Only one of -dedicated or -listen can be specified\n");
-               // default sv_public on for dedicated servers (often hosted by serious administrators), off for listen servers (often hosted by clueless users)
-               Cvar_SetValue(&cvars_all, "sv_public", 1);
-       }
-       else if (cl_available)
-       {
-               // client exists and not dedicated, check if -listen is specified
-               cls.state = ca_disconnected;
-               i = Sys_CheckParm ("-listen");
-               if (i)
-               {
-                       // default players unless specified
-                       if (i + 1 < sys.argc && atoi (sys.argv[i+1]) >= 1)
-                               svs.maxclients = atoi (sys.argv[i+1]);
-               }
-               else
-               {
-                       // default players in some games, singleplayer in most
-                       if (gamemode != GAME_GOODVSBAD2 && !IS_NEXUIZ_DERIVED(gamemode) && gamemode != GAME_BATTLEMECH)
-                               svs.maxclients = 1;
-               }
-       }
-
-       svs.maxclients = svs.maxclients_next = bound(1, svs.maxclients, MAX_SCOREBOARD);
-
-       svs.clients = (client_t *)Mem_Alloc(sv_mempool, sizeof(client_t) * svs.maxclients);
-
-       if (svs.maxclients > 1 && !deathmatch.integer && !coop.integer)
-               Cvar_SetValueQuick(&deathmatch, 1);
-}
-
 /*
 ==================
 Host_Quit_f
@@ -522,21 +471,6 @@ void Host_Main(void)
 
 //============================================================================
 
-qbool vid_opened = false;
-void Host_StartVideo(void)
-{
-       if (!vid_opened && cls.state != ca_dedicated)
-       {
-               vid_opened = true;
-#ifdef WIN32
-               // make sure we open sockets before opening video because the Windows Firewall "unblock?" dialog can screw up the graphics context on some graphics drivers
-               NetConn_UpdateSockets();
-#endif
-               VID_Start();
-               CDAudio_Startup();
-       }
-}
-
 char engineversion[128];
 
 qbool sys_nostdout = false;
@@ -713,7 +647,6 @@ static void Host_Init (void)
        World_Init();
        SV_Init();
        Host_InitLocal();
-       Host_ServerOptions();
 
        Thread_Init();
        TaskQueue_Init();
@@ -740,7 +673,7 @@ static void Host_Init (void)
 
        host.state = host_active;
 
-       Host_StartVideo();
+       CL_StartVideo();
 
        Log_Start();