X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=host.c;h=de12e31f8bd158d0680bbf3c70c4986aed9530ea;hp=455f55d5b4e9b5093a8df0fe1d8635e28af9bd2b;hb=3bddef8837924e402d275a0201ae25ecf3767b09;hpb=a97ec7093619b8bba984d053b6a2e9036538c96b diff --git a/host.c b/host.c index 455f55d5..de12e31f 100644 --- a/host.c +++ b/host.c @@ -52,47 +52,19 @@ client_t *host_client; jmp_buf host_abortframe; -// random seed -cvar_t sv_random_seed = {0, "sv_random_seed", "", "random seed; when set, on every map start this random seed is used to initialize the random number generator. Don't touch it unless for benchmarking or debugging"}; - // pretend frames take this amount of time (in seconds), 0 = realtime cvar_t host_framerate = {0, "host_framerate","0", "locks frame timing to this value in seconds, 0.05 is 20fps for example, note that this can easily run too fast, use cl_maxfps if you want to limit your framerate instead, or sys_ticrate to limit server speed"}; // shows time used by certain subsystems cvar_t host_speeds = {0, "host_speeds","0", "reports how much time is used in server/graphics/sound"}; -// LordHavoc: framerate independent slowmo -cvar_t slowmo = {0, "slowmo", "1.0", "controls game speed, 0.5 is half speed, 2 is double speed"}; // LordHavoc: framerate upper cap cvar_t cl_maxfps = {CVAR_SAVE, "cl_maxfps", "1000", "maximum fps cap, if game is running faster than this it will wait before running another frame (useful to make cpu time available to other programs)"}; -// print broadcast messages in dedicated mode -cvar_t sv_echobprint = {CVAR_SAVE, "sv_echobprint", "1", "prints gamecode bprint() calls to server console"}; - -cvar_t sys_ticrate = {CVAR_SAVE, "sys_ticrate","0.05", "how long a server frame is in seconds, 0.05 is 20fps server rate, 0.1 is 10fps (can not be set higher than 0.1), 0 runs as many server frames as possible (makes games against bots a little smoother, overwhelms network players)"}; -cvar_t sv_fixedframeratesingleplayer = {0, "sv_fixedframeratesingleplayer", "0", "allows you to use server-style timing system in singleplayer (don't run faster than sys_ticrate)"}; - -cvar_t fraglimit = {CVAR_NOTIFY, "fraglimit","0", "ends level if this many frags is reached by any player"}; -cvar_t timelimit = {CVAR_NOTIFY, "timelimit","0", "ends level at this time (in minutes)"}; -cvar_t teamplay = {CVAR_NOTIFY, "teamplay","0", "teamplay mode, values depend on mod but typically 0 = no teams, 1 = no team damage no self damage, 2 = team damage and self damage, some mods support 3 = no team damage but can damage self"}; - -cvar_t samelevel = {CVAR_NOTIFY, "samelevel","0", "repeats same level if level ends (due to timelimit or someone hitting an exit)"}; -cvar_t noexit = {CVAR_NOTIFY, "noexit","0", "kills anyone attempting to use an exit"}; - cvar_t developer = {0, "developer","0", "prints additional debugging messages and information (recommended for modders and level designers)"}; cvar_t developer_entityparsing = {0, "developer_entityparsing", "0", "prints detailed network entities information each time a packet is received"}; -cvar_t skill = {0, "skill","1", "difficulty level of game, affects monster layouts in levels, 0 = easy, 1 = normal, 2 = hard, 3 = nightmare (same layout as hard but monsters fire twice)"}; -cvar_t deathmatch = {0, "deathmatch","0", "deathmatch mode, values depend on mod but typically 0 = no deathmatch, 1 = normal deathmatch with respawning weapons, 2 = weapons stay (players can only pick up new weapons)"}; -cvar_t coop = {0, "coop","0", "coop mode, 0 = no coop, 1 = coop mode, multiple players playing through the singleplayer game (coop mode also shuts off deathmatch)"}; - -cvar_t pausable = {0, "pausable","1", "allow players to pause or not"}; - -cvar_t temp1 = {0, "temp1","0", "general cvar for mods to use, in stock id1 this selects which death animation to use on players (0 = random death, other values select specific death scenes)"}; - cvar_t timestamps = {CVAR_SAVE, "timestamps", "0", "prints timestamps on console messages"}; cvar_t timeformat = {CVAR_SAVE, "timeformat", "[%Y-%m-%d %H:%M:%S] ", "time format to use on timestamped console messages"}; -cvar_t sv_checkforpacketsduringsleep = {0, "sv_checkforpacketsduringsleep", "0", "uses select() function to wait between frames which can be interrupted by packets being received, instead of Sleep()/usleep()/SDL_Sleep() functions which do not check for packets"}; - /* ================ Host_AbortCurrentFrame @@ -224,36 +196,15 @@ static void Host_InitLocal (void) Cmd_AddCommand("saveconfig", Host_SaveConfig_f, "save settings to config.cfg immediately (also automatic when quitting)"); Cmd_AddCommand("loadconfig", Host_LoadConfig_f, "reset everything and reload configs"); - Cvar_RegisterVariable (&sv_random_seed); Cvar_RegisterVariable (&host_framerate); Cvar_RegisterVariable (&host_speeds); - Cvar_RegisterVariable (&slowmo); Cvar_RegisterVariable (&cl_maxfps); - Cvar_RegisterVariable (&sv_echobprint); - - Cvar_RegisterVariable (&sys_ticrate); - Cvar_RegisterVariable (&sv_fixedframeratesingleplayer); - - Cvar_RegisterVariable (&fraglimit); - Cvar_RegisterVariable (&timelimit); - Cvar_RegisterVariable (&teamplay); - Cvar_RegisterVariable (&samelevel); - Cvar_RegisterVariable (&noexit); - Cvar_RegisterVariable (&skill); Cvar_RegisterVariable (&developer); Cvar_RegisterVariable (&developer_entityparsing); - Cvar_RegisterVariable (&deathmatch); - Cvar_RegisterVariable (&coop); - - Cvar_RegisterVariable (&pausable); - - Cvar_RegisterVariable (&temp1); Cvar_RegisterVariable (×tamps); Cvar_RegisterVariable (&timeformat); - - Cvar_RegisterVariable (&sv_checkforpacketsduringsleep); } @@ -418,7 +369,7 @@ if (crash = true), don't bother sending signofs void SV_DropClient(qboolean crash) { int i; - Con_Printf("Client \"%s\" dropped\n", host_client->name); + Con_Printf("Client \"%s^%i\" dropped\n", host_client->name, STRING_COLOR_DEFAULT); // make sure edict is not corrupt (from a level change for example) host_client->edict = PRVM_EDICT_NUM(host_client - svs.clients + 1); @@ -771,7 +722,7 @@ void Host_Main(void) clframetime = cl.realframetime = 0.1; // apply slowmo scaling - clframetime *= slowmo.value; + clframetime *= cl.movevars_timescale; // host_framerate overrides all else if (host_framerate.value) @@ -789,16 +740,17 @@ void Host_Main(void) // Collect input into cmd CL_Input(); + // check for new packets NetConn_ClientFrame(); - if (cls.state == ca_connected) - { - CL_ReadFromServer(); - // if running the server remotely, send intentions now after - // the incoming messages have been read - //if (!cl.islocalgame) - // CL_SendCmd(); - } + // read a new frame from a demo if needed + CL_ReadDemoMessage(); + + // now that packets have been read, send input to server + CL_SendMove(); + + // update client world (interpolate entities, create trails, etc) + CL_UpdateWorld(); // update video if (host_speeds.integer) @@ -814,10 +766,10 @@ void Host_Main(void) time2 = Sys_DoubleTime(); // update audio - if(csqc_usecsqclistener) + if(cl.csqc_usecsqclistener) { - S_Update(&csqc_listenermatrix); - csqc_usecsqclistener = false; + S_Update(&cl.csqc_listenermatrix); + cl.csqc_usecsqclistener = false; } else S_Update(&r_view.matrix);