X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=host.c;h=b1ed19b011dbe26d408ea27d1d0d3229965e3c8e;hb=7342a29b5308d9769982d53361313c82ceea0ed0;hp=9a679db3e14cfddd715738d38c3e2c96107a99bd;hpb=5cf8eacc9621cf85f9d0474e59289b13d083260f;p=xonotic%2Fdarkplaces.git diff --git a/host.c b/host.c index 9a679db3..b1ed19b0 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 @@ -180,10 +152,15 @@ void Host_Error (const char *error, ...) longjmp (host_abortserver, 1); } +mempool_t *sv_clients_mempool = NULL; + void Host_ServerOptions (void) { int i, numplayers; + // general default + numplayers = 8; + if (cl_available) { // client exists, check what mode the user wants @@ -191,7 +168,7 @@ void Host_ServerOptions (void) if (i) { cls.state = ca_dedicated; - numplayers = 8; + // default players unless specified if (i != (com_argc - 1)) numplayers = atoi (com_argv[i+1]); if (COM_CheckParm ("-listen")) @@ -199,73 +176,59 @@ void Host_ServerOptions (void) } else { - numplayers = 1; cls.state = ca_disconnected; i = COM_CheckParm ("-listen"); if (i) { - numplayers = 8; + // default players unless specified if (i != (com_argc - 1)) numplayers = atoi (com_argv[i+1]); } + else + { + // default players in some games, singleplayer in most + if (gamemode != GAME_TRANSFUSION && gamemode != GAME_GOODVSBAD2 && gamemode != GAME_NEXUIZ && gamemode != GAME_BATTLEMECH) + numplayers = 1; + } } } else { - // no client in the executable, start dedicated server + // no client in the executable, always start dedicated server if (COM_CheckParm ("-listen")) Sys_Error ("-listen not available in a dedicated server executable"); - numplayers = 8; cls.state = ca_dedicated; // check for -dedicated specifying how many players i = COM_CheckParm ("-dedicated"); + // default players unless specified if (i && i != (com_argc - 1)) numplayers = atoi (com_argv[i+1]); } if (numplayers < 1) numplayers = 8; - if (numplayers > MAX_SCOREBOARD) - numplayers = MAX_SCOREBOARD; - // Transfusion doesn't support single player games - if (gamemode == GAME_TRANSFUSION && numplayers < 4) - numplayers = 4; + numplayers = bound(1, numplayers, MAX_SCOREBOARD); - if (numplayers > 1) - Cvar_SetValueQuick (&deathmatch, 1); - else - Cvar_SetValueQuick (&deathmatch, 0); + if (numplayers > 1 && !deathmatch.integer) + Cvar_SetValueQuick(&deathmatch, 1); - svs.maxclients = 0; - SV_SetMaxClients(numplayers); + svs.maxclients = numplayers; + sv_clients_mempool = Mem_AllocPool("server clients", 0, NULL); + svs.clients = Mem_Alloc(sv_clients_mempool, sizeof(client_t) * svs.maxclients); } -static mempool_t *clients_mempool; -void SV_SetMaxClients(int n) -{ - if (sv.active) - return; - n = bound(1, n, MAX_SCOREBOARD); - if (svs.maxclients == n) - return; - svs.maxclients = n; - if (!clients_mempool) - clients_mempool = Mem_AllocPool("clients"); - if (svs.clients) - Mem_Free(svs.clients); - svs.clients = Mem_Alloc(clients_mempool, svs.maxclients*sizeof(client_t)); -} - - /* ======================= 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); @@ -303,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; @@ -319,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; } @@ -331,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 @@ -342,14 +319,38 @@ 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); + + SV_ClientPrint(msg); +} + +/* +================= +SV_BroadcastPrint + +Sends text to all active clients +================= +*/ +void SV_BroadcastPrint(const char *msg) +{ + int i; + client_t *client; - MSG_WriteByte (&host_client->message, svc_print); - MSG_WriteString (&host_client->message, string); + for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++) + { + if (client->spawned) + { + MSG_WriteByte(&client->message, svc_print); + MSG_WriteString(&client->message, msg); + } + } + + if (sv_echobprint.integer && cls.state == ca_dedicated) + Sys_Print(msg); } /* @@ -362,22 +363,13 @@ Sends text to all active clients void SV_BroadcastPrintf(const char *fmt, ...) { va_list argptr; - char string[1024]; - int i; + char msg[4096]; va_start(argptr,fmt); - vsprintf(string, fmt,argptr); + vsnprintf(msg,sizeof(msg),fmt,argptr); va_end(argptr); - for (i=0 ; inetconnection) { // free the client (the body stays around) - host_client->active = false; - if (!crash) { // LordHavoc: no opportunity for resending, so use unreliable @@ -446,27 +436,29 @@ void SV_DropClient(qboolean crash) } } - // now clear name (after ClientDisconnect was called) - host_client->name[0] = 0; - host_client->old_frags = -999999; - // send notification to all clients for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++) { if (!client->active) continue; MSG_WriteByte(&client->message, svc_updatename); - MSG_WriteByte(&client->message, host_client - svs.clients); + MSG_WriteByte(&client->message, host_client->number); MSG_WriteString(&client->message, ""); MSG_WriteByte(&client->message, svc_updatefrags); - MSG_WriteByte(&client->message, host_client - svs.clients); + MSG_WriteByte(&client->message, host_client->number); MSG_WriteShort(&client->message, 0); MSG_WriteByte(&client->message, svc_updatecolors); - MSG_WriteByte(&client->message, host_client - svs.clients); + MSG_WriteByte(&client->message, host_client->number); MSG_WriteByte(&client->message, 0); } NetConn_Heartbeat(1); + + // free the client now + if (host_client->entitydatabase4) + EntityFrame4_FreeDatabase(host_client->entitydatabase4); + // clear the client struct (this sets active to false) + memset(host_client, 0, sizeof(*host_client)); } /* @@ -481,7 +473,8 @@ void Host_ShutdownServer(qboolean crash) int i, count; sizebuf_t buf; char message[4]; - double start; + + Con_DPrintf("Host_ShutdownServer\n"); if (!sv.active) return; @@ -489,39 +482,9 @@ void Host_ShutdownServer(qboolean crash) // 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); -// flush any pending messages - like the score!!! - start = Sys_DoubleTime(); - do - { - count = 0; - NetConn_ClientFrame(); - NetConn_ServerFrame(); - for (i=0, host_client = svs.clients ; iactive && host_client->message.cursize) - { - if (NetConn_CanSendMessage(host_client->netconnection)) - { - NetConn_SendReliableMessage(host_client->netconnection, &host_client->message); - SZ_Clear(&host_client->message); - } - else - count++; - } - } - if ((Sys_DoubleTime() - start) > 3.0) - break; - } - while(count); - // make sure all the clients know we're disconnecting buf.data = message; buf.maxsize = 4; @@ -531,17 +494,19 @@ void Host_ShutdownServer(qboolean crash) if (count) Con_Printf("Host_ShutdownServer: NetConn_SendToAll failed for %u clients\n", count); - for (i=0, host_client = svs.clients ; iactive) SV_DropClient(crash); // server shutdown NetConn_CloseServerPorts(); + sv.active = false; + // // clear structures // memset(&sv, 0, sizeof(sv)); - memset(svs.clients, 0, svs.maxclients * sizeof(client_t)); + memset(svs.clients, 0, svs.maxclients*sizeof(client_t)); } @@ -555,7 +520,7 @@ not reinitialize anything. */ void Host_ClearMemory (void) { - Con_DPrintf ("Clearing memory\n"); + Con_DPrint("Clearing memory\n"); Mod_ClearAll (); cls.signon = 0; @@ -576,7 +541,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) @@ -589,21 +554,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 @@ -665,14 +636,14 @@ void Host_ServerFrame (void) { static double frametimetotal = 0, lastservertime = 0; frametimetotal += host_frametime; - // LordHavoc: cap server at sys_ticrate in listen games - if (cls.state != ca_dedicated && svs.maxclients > 1 && ((realtime - lastservertime) < sys_ticrate.value)) + // LordHavoc: cap server at sys_ticrate in networked games + if (!cl.islocalgame && ((realtime - lastservertime) < sys_ticrate.value)) return; NetConn_ServerFrame(); // run the world state - if (!sv.paused && (svs.maxclients > 1 || (key_dest == key_game && !key_consoleactive))) + if (!sv.paused && (!cl.islocalgame || (key_dest == key_game && !key_consoleactive))) sv.frametime = pr_global_struct->frametime = frametimetotal; else sv.frametime = 0; @@ -711,6 +682,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 @@ -720,11 +692,9 @@ 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(); // get new key events Sys_SendKeyEvents(); @@ -732,15 +702,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); //------------------- // @@ -770,11 +740,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(); @@ -782,21 +752,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(); @@ -812,6 +781,7 @@ void _Host_Frame (float time) host_framecount++; host_loopactive = true; + } void Host_Frame (float time) @@ -847,7 +817,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); } //============================================================================ @@ -861,6 +831,8 @@ Host_Init */ void Host_Init (void) { + int i; + // LordHavoc: quake never seeded the random number generator before... heh srand(time(NULL)); @@ -879,17 +851,15 @@ void Host_Init (void) V_Init(); COM_Init(); Host_InitLocal(); - W_LoadWadFile("gfx.wad"); 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) { @@ -903,18 +873,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 (); } @@ -932,21 +924,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 (); }