X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=host.c;h=ee9248670c5c4feeca09c705faee3e68590ea68b;hb=17c744aa8c36c564ec3d18df730d456edea5fb0a;hp=dadc7ed3eb5000a86b24ba0134178b2038635108;hpb=e1ec645e2d59310561f997421f9ecd98f5832d8d;p=xonotic%2Fdarkplaces.git diff --git a/host.c b/host.c index dadc7ed3..ee924867 100644 --- a/host.c +++ b/host.c @@ -96,35 +96,6 @@ cvar_t temp1 = {0, "temp1","0"}; cvar_t timestamps = {CVAR_SAVE, "timestamps", "0"}; cvar_t timeformat = {CVAR_SAVE, "timeformat", "[%b %e %X] "}; -/* -================ -Host_EndGame -================ -*/ -void Host_EndGame (const char *format, ...) -{ - va_list argptr; - char string[1024]; - - va_start (argptr,format); - vsprintf (string,format,argptr); - va_end (argptr); - Con_DPrintf ("Host_EndGame: %s\n",string); - - if (sv.active) - Host_ShutdownServer (false); - - if (cls.state == ca_dedicated) - Sys_Error ("Host_EndGame: %s\n",string); // dedicated servers exit - - if (cls.demonum != -1) - CL_NextDemo (); - else - CL_Disconnect (); - - longjmp (host_abortserver, 1); -} - /* ================ Host_Error @@ -132,11 +103,10 @@ Host_Error This shuts down both the client and server ================ */ +void PRVM_ProcessError(void); static char hosterrorstring1[4096]; static char hosterrorstring2[4096]; static qboolean hosterror = false; -extern char sv_spawnmap[MAX_QPATH]; -extern char sv_loadgame[MAX_OSPATH]; void Host_Error (const char *error, ...) { va_list argptr; @@ -145,7 +115,7 @@ void Host_Error (const char *error, ...) vsprintf (hosterrorstring1,error,argptr); va_end (argptr); - Con_Printf ("Host_Error: %s\n", hosterrorstring1); + Con_Printf("Host_Error: %s\n", hosterrorstring1); // LordHavoc: if first frame has not been shown, or currently shutting // down, do Sys_Error instead @@ -158,16 +128,18 @@ void Host_Error (const char *error, ...) strcpy(hosterrorstring2, hosterrorstring1); - // make sure we don't get in a loading loop - sv_loadgame[0] = 0; - sv_spawnmap[0] = 0; - CL_Parse_DumpPacket(); PR_Crash(); - if (sv.active) - Host_ShutdownServer (false); + //PRVM_Crash(); // crash current prog + + // crash all prvm progs + PRVM_CrashAll(); + + PRVM_ProcessError(); + + Host_ShutdownServer (false); if (cls.state == ca_dedicated) Sys_Error ("Host_Error: %s\n",hosterrorstring2); // dedicated servers exit @@ -242,7 +214,7 @@ void Host_ServerOptions (void) Cvar_SetValueQuick(&deathmatch, 1); svs.maxclients = numplayers; - sv_clients_mempool = Mem_AllocPool("server clients"); + sv_clients_mempool = Mem_AllocPool("server clients", 0, NULL); svs.clients = Mem_Alloc(sv_clients_mempool, sizeof(client_t) * svs.maxclients); } @@ -251,9 +223,12 @@ void Host_ServerOptions (void) Host_InitLocal ====================== */ +void Host_SaveConfig_f(void); void Host_InitLocal (void) { Host_InitCommands (); + + Cmd_AddCommand("saveconfig", Host_SaveConfig_f); Cvar_RegisterVariable (&host_framerate); Cvar_RegisterVariable (&host_speeds); @@ -291,12 +266,12 @@ void Host_InitLocal (void) /* =============== -Host_WriteConfiguration +Host_SaveConfig_f Writes key bindings and archived cvars to config.cfg =============== */ -void Host_WriteConfiguration (void) +void Host_SaveConfig_f(void) { qfile_t *f; @@ -307,7 +282,7 @@ void Host_WriteConfiguration (void) f = FS_Open ("config.cfg", "w", false); if (!f) { - Con_Printf ("Couldn't write config.cfg.\n"); + Con_Print("Couldn't write config.cfg.\n"); return; } @@ -319,6 +294,20 @@ void Host_WriteConfiguration (void) } +/* +================= +SV_ClientPrint + +Sends text across to be displayed +FIXME: make this just a stuffed echo? +================= +*/ +void SV_ClientPrint(const char *msg) +{ + MSG_WriteByte(&host_client->message, svc_print); + MSG_WriteString(&host_client->message, msg); +} + /* ================= SV_ClientPrintf @@ -330,45 +319,57 @@ FIXME: make this just a stuffed echo? void SV_ClientPrintf(const char *fmt, ...) { va_list argptr; - char string[1024]; + char msg[4096]; - va_start (argptr,fmt); - vsprintf (string, fmt,argptr); - va_end (argptr); + va_start(argptr,fmt); + vsnprintf(msg,sizeof(msg),fmt,argptr); + va_end(argptr); - MSG_WriteByte (&host_client->message, svc_print); - MSG_WriteString (&host_client->message, string); + SV_ClientPrint(msg); } /* ================= -SV_BroadcastPrintf +SV_BroadcastPrint Sends text to all active clients ================= */ -void SV_BroadcastPrintf(const char *fmt, ...) +void SV_BroadcastPrint(const char *msg) { - va_list argptr; - char string[4096]; int i; client_t *client; - va_start(argptr,fmt); - vsnprintf(string, sizeof(string), fmt,argptr); - va_end(argptr); - for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++) { if (client->spawned) { MSG_WriteByte(&client->message, svc_print); - MSG_WriteString(&client->message, string); + MSG_WriteString(&client->message, msg); } } if (sv_echobprint.integer && cls.state == ca_dedicated) - Sys_Printf("%s", string); + Sys_Print(msg); +} + +/* +================= +SV_BroadcastPrintf + +Sends text to all active clients +================= +*/ +void SV_BroadcastPrintf(const char *fmt, ...) +{ + va_list argptr; + char msg[4096]; + + va_start(argptr,fmt); + vsnprintf(msg,sizeof(msg),fmt,argptr); + va_end(argptr); + + SV_BroadcastPrint(msg); } /* @@ -454,8 +455,12 @@ void SV_DropClient(qboolean crash) NetConn_Heartbeat(1); // free the client now + if (host_client->entitydatabase) + EntityFrame_FreeDatabase(host_client->entitydatabase); if (host_client->entitydatabase4) EntityFrame4_FreeDatabase(host_client->entitydatabase4); + if (host_client->entitydatabase5) + EntityFrame5_FreeDatabase(host_client->entitydatabase5); // clear the client struct (this sets active to false) memset(host_client, 0, sizeof(*host_client)); } @@ -473,17 +478,14 @@ void Host_ShutdownServer(qboolean crash) sizebuf_t buf; char message[4]; + Con_DPrintf("Host_ShutdownServer\n"); + if (!sv.active) return; // print out where the crash happened, if it was caused by QC PR_Crash(); - sv.active = false; - -// stop all client sounds immediately - CL_Disconnect(); - NetConn_Heartbeat(2); NetConn_Heartbeat(2); @@ -502,6 +504,8 @@ void Host_ShutdownServer(qboolean crash) NetConn_CloseServerPorts(); + sv.active = false; + // // clear structures // @@ -520,7 +524,7 @@ not reinitialize anything. */ void Host_ClearMemory (void) { - Con_DPrintf ("Clearing memory\n"); + Con_DPrint("Clearing memory\n"); Mod_ClearAll (); cls.signon = 0; @@ -541,7 +545,7 @@ Returns false if the time is too short to run a frame extern cvar_t cl_avidemo; qboolean Host_FilterTime (double time) { - double timecap; + double timecap, timeleft; realtime += time; if (slowmo.value < 0.0f) @@ -554,21 +558,27 @@ qboolean Host_FilterTime (double time) Cvar_SetValue("cl_avidemo", 0.0f); // check if framerate is too high - if (cl_avidemo.value >= 0.1f) + if (!cls.timedemo) { - timecap = 1.0 / (double)cl_avidemo.value; - if ((realtime - oldrealtime) < timecap) - return false; - } - else if (!cls.timedemo) - { - // default to sys_ticrate (server framerate - presumably low) unless we're the active window and either connected to a server or playing a video + // default to sys_ticrate (server framerate - presumably low) unless we + // have a good reason to run faster timecap = sys_ticrate.value; - if (vid_activewindow && (cls.state == ca_connected || cl_videoplaying)) - timecap = 1.0 / host_maxfps.value; + if (cls.state != ca_dedicated) + { + if (cl_avidemo.value >= 0.1f) + timecap = 1.0 / (double)cl_avidemo.value; + else if (vid_activewindow) + timecap = 1.0 / host_maxfps.value; + } - if ((realtime - oldrealtime) < timecap) + timeleft = oldrealtime + timecap - realtime; + if (timeleft > 0) + { + // don't totally hog the CPU + if (timeleft >= 0.02) + Sys_Sleep((int)(timeleft * 1000) - 5); return false; + } } // LordHavoc: copy into host_realframetime as well @@ -676,6 +686,7 @@ void _Host_Frame (float time) static double time2 = 0; static double time3 = 0; int pass1, pass2, pass3; + usercmd_t cmd; // Used for receiving input if (setjmp(host_abortserver)) return; // something bad happened, or the server disconnected @@ -685,11 +696,7 @@ void _Host_Frame (float time) // decide the simulation time if (!Host_FilterTime(time)) - { - // if time was rejected, don't totally hog the CPU - Sys_Sleep(); return; - } cl.islocalgame = NetConn_IsLocalGame(); @@ -699,15 +706,15 @@ void _Host_Frame (float time) // allow mice or other external controllers to add commands IN_Commands(); + // Collect input into cmd + IN_ProcessMove(&cmd); + // process console commands Cbuf_Execute(); - // LordHavoc: map and load are delayed until video is initialized - Host_PerformSpawnServerAndLoadGame(); - // if running the server locally, make intentions now if (cls.state == ca_connected && sv.active) - CL_SendCmd(); + CL_SendCmd(&cmd); //------------------- // @@ -737,11 +744,11 @@ void _Host_Frame (float time) // if running the server remotely, send intentions now after // the incoming messages have been read if (!sv.active) - CL_SendCmd(); + CL_SendCmd(&cmd); CL_ReadFromServer(); } - ui_update(); + //ui_update(); CL_VideoFrame(); @@ -749,21 +756,20 @@ void _Host_Frame (float time) if (host_speeds.integer) time1 = Sys_DoubleTime(); + R_UpdateWorld(); CL_UpdateScreen(); if (host_speeds.integer) time2 = Sys_DoubleTime(); // update audio - if (cls.signon == SIGNONS) + if (cls.signon == SIGNONS && cl.viewentity >= 0 && cl.viewentity < MAX_EDICTS && cl_entities[cl.viewentity].state_current.active) { // LordHavoc: this used to use renderer variables (eww) - vec3_t forward, right, up; - AngleVectors(cl.viewangles, forward, right, up); - S_Update(cl_entities[cl.viewentity].render.origin, forward, right, up); + S_Update(&cl_entities[cl.viewentity].render.matrix); } else - S_Update(vec3_origin, vec3_origin, vec3_origin, vec3_origin); + S_Update(&identitymatrix); CDAudio_Update(); @@ -779,6 +785,7 @@ void _Host_Frame (float time) host_framecount++; host_loopactive = true; + } void Host_Frame (float time) @@ -814,7 +821,7 @@ void Host_Frame (float time) c++; } - Con_Printf ("serverprofile: %2i clients %2i msec\n", c, m); + Con_Printf("serverprofile: %2i clients %2i msec\n", c, m); } //============================================================================ @@ -828,6 +835,8 @@ Host_Init */ void Host_Init (void) { + int i; + // LordHavoc: quake never seeded the random number generator before... heh srand(time(NULL)); @@ -848,14 +857,13 @@ void Host_Init (void) Host_InitLocal(); Key_Init(); Con_Init(); - Chase_Init(); - M_Init(); PR_Init(); + PRVM_Init(); Mod_Init(); NetConn_Init(); SV_Init(); - Con_Printf ("Builddate: %s\n", buildstring); + Con_Printf("Builddate: %s\n", buildstring); if (cls.state != ca_dedicated) { @@ -869,18 +877,40 @@ void Host_Init (void) CL_Init(); } - Cbuf_InsertText ("exec quake.rc\n"); - Cbuf_Execute(); - Cbuf_Execute(); - Cbuf_Execute(); + // only cvars are executed when host_initialized == false + if (gamemode == GAME_TEU) + Cbuf_InsertText("exec teu.rc\n"); + else + Cbuf_InsertText("exec quake.rc\n"); Cbuf_Execute(); host_initialized = true; - Con_DPrintf ("========Initialized=========\n"); + Con_DPrint("========Initialized=========\n"); if (cls.state != ca_dedicated) + { VID_Open(); + SCR_BeginLoadingPlaque(); + MR_Init(); + } + + // stuff it again so the first host frame will execute it again, this time + // in its entirety + if (gamemode == GAME_TEU) + Cbuf_InsertText("exec teu.rc\n"); + else + Cbuf_InsertText("exec quake.rc\n"); + + // check for special benchmark mode + i = COM_CheckParm("-benchmark"); + if (i && i + 1 < com_argc) + Cbuf_InsertText(va("timedemo %s\n", com_argv[i + 1])); + + Cbuf_Execute(); + + // We must wait for the log_file cvar to be initialized to start the log + Log_Start (); } @@ -898,21 +928,31 @@ void Host_Shutdown(void) if (isdown) { - Con_Printf ("recursive shutdown\n"); + Con_Print("recursive shutdown\n"); return; } isdown = true; - Host_WriteConfiguration (); + // Shutdown menu + if(MR_Shutdown) + MR_Shutdown(); + + // AK shutdown PRVM + // AK hmm, no PRVM_Shutdown(); yet + + + Host_SaveConfig_f(); CDAudio_Shutdown (); NetConn_Shutdown (); - S_Shutdown(); if (cls.state != ca_dedicated) { R_Modules_Shutdown(); VID_Shutdown(); } + + Sys_Shutdown(); + Log_Close (); }