diff --git a/qw/source/sv_ccmds.c b/qw/source/sv_ccmds.c index 74d1f4d22..33ea2d276 100644 --- a/qw/source/sv_ccmds.c +++ b/qw/source/sv_ccmds.c @@ -580,7 +580,7 @@ SV_Cuff_f (void) if (!cl->state) continue; if (all || (cl->userid == uid)) { - cl->cuff_time = (Sys_DoubleTime () + mins*60.0); + cl->cuff_time = realtime + mins*60.0; done = true; if (mins) { sprintf(text, @@ -639,7 +639,7 @@ SV_Mute_f (void) if (!cl->state) continue; if (all || (cl->userid == uid)) { - cl->lockedtill = (Sys_DoubleTime () + mins*60.0); + cl->lockedtill = realtime + mins*60.0; done = true; if (mins) { sprintf(text, "You are muted for %.1f minutes\n\n" diff --git a/qw/source/sv_init.c b/qw/source/sv_init.c index 966ca11d0..3934035c8 100644 --- a/qw/source/sv_init.c +++ b/qw/source/sv_init.c @@ -331,9 +331,6 @@ SV_SpawnServer (const char *server) strcpy (sv.name, server); - // Misty: What, me worry? (Yes, it's BAAAACK) HACKHACKHACK - realtime = 0.1; - // load progs to get entity field count which determines how big each // edict is SV_LoadProgs (); diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c index fd5813738..a72c852ab 100644 --- a/qw/source/sv_main.c +++ b/qw/source/sv_main.c @@ -565,11 +565,10 @@ SV_CheckLog (void) sz = &svs.log[svs.logsequence & 1]; - // bump sequence if almost full, or ten minutes have passed and + // bump sequence if allmost full, or ten minutes have passed and // there is something still sitting there if (sz->cursize > LOG_HIGHWATER - || ((realtime - svs.logtime) > LOG_FLUSH && sz->cursize) - || (realtime - svs.logtime) < 0) { + || (realtime - svs.logtime > LOG_FLUSH && sz->cursize)) { // swap buffers and bump sequence svs.logtime = realtime; svs.logsequence++; @@ -578,6 +577,7 @@ SV_CheckLog (void) SV_Printf ("beginning fraglog sequence %i\n", svs.logsequence); } } + /* SVC_Log @@ -1340,7 +1340,7 @@ SV_CleanIPList (void) char *type; for (i = 0; i < numipfilters;) { - if (ipfilters[i].time && (ipfilters[i].time <= Sys_DoubleTime () )) { + if (ipfilters[i].time && (ipfilters[i].time <= realtime)) { switch (ipfilters[i].type) { case ft_ban: type = "Ban"; break; case ft_mute: type = "Mute"; break; @@ -1392,7 +1392,7 @@ SV_AddIP_f (void) } if (SV_StringToFilter (Cmd_Argv (1), &ipfilters[numipfilters])) { - ipfilters[numipfilters].time = bantime ? Sys_DoubleTime () + bantime : 0.0; + ipfilters[numipfilters].time = bantime ? realtime + bantime : 0.0; ipfilters[numipfilters].type = type; // FIXME: this should boot any matching clients for (i = 0; i < MAX_CLIENTS; i++) { @@ -1479,8 +1479,7 @@ SV_ListIP_f (void) if (ipfilters[i].time) snprintf (timestr, sizeof (timestr), "%ds", - (int) (ipfilters[i].time ? ipfilters[i].time - - Sys_DoubleTime () : 0)); + (int) (ipfilters[i].time ? ipfilters[i].time - realtime : 0)); else strcpy (timestr, "Permanent"); @@ -1595,8 +1594,7 @@ SV_SendBan (double till) if (till) { snprintf (data + 5, sizeof (data) - 5, - "\nbanned for %.1f more minutes.\n", (till - - Sys_DoubleTime ())/60.0); + "\nbanned for %.1f more minutes.\n", (till - realtime)/60.0); } else { snprintf (data + 5, sizeof (data) - 5, "\nbanned permanently.\n"); } @@ -1625,7 +1623,7 @@ SV_FilterIP (byte *ip, double *until) if (!ipfilters[i].time) { // normal ban return filterban->int_val; - } else if (ipfilters[i].time > Sys_DoubleTime () ) { + } else if (ipfilters[i].time > realtime) { *until = ipfilters[i].time; return true; // banned no matter what } else { @@ -1643,7 +1641,7 @@ SV_SavePenaltyFilter (client_t *cl, filtertype_t type, double pentime) { int i; byte *b; - if (pentime < Sys_DoubleTime () ) // no point + if (pentime < realtime) // no point return; b = cl->netchan.remote_address.ip; @@ -1886,25 +1884,19 @@ SV_Frame (float time) if (!sv.paused) { static double old_time; - // Misty: Make sure we don't set sv_frametime to 0 or less than 0. - // Progs HATES it when we do that. - if (realtime - old_time > 0) { // don't bother running a frame if sys_ticrate seconds haven't passed - sv_frametime = realtime - old_time; - if (sv_frametime >= sv_mintic->value) { - if (sv_frametime > sv_maxtic->value) { - sv_frametime = sv_maxtic->value; - } - old_time = realtime; - - *sv_globals.frametime = sv_frametime; - - SV_Physics (); - } - } else { + sv_frametime = realtime - old_time; + if (sv_frametime >= sv_mintic->value) { + if (sv_frametime > sv_maxtic->value) + sv_frametime = sv_maxtic->value; old_time = realtime; + + *sv_globals.frametime = sv_frametime; + + SV_Physics (); } } + // get packets SV_ReadPackets (); @@ -2165,8 +2157,9 @@ Master_Heartbeat (void) char string[2048]; int active, i; - if ((realtime - svs.last_heartbeat) < HEARTBEAT_SECONDS) + if (realtime - svs.last_heartbeat < HEARTBEAT_SECONDS) return; // not time to send yet + svs.last_heartbeat = realtime; // count active users diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c index 047f8476e..64abe7a09 100644 --- a/qw/source/sv_user.c +++ b/qw/source/sv_user.c @@ -798,11 +798,10 @@ SV_Say (qboolean team) } if (fp_messages) { - if (!sv.paused && Sys_DoubleTime () < host_client->lockedtill) { + if (!sv.paused && realtime < host_client->lockedtill) { SV_ClientPrintf (host_client, PRINT_CHAT, - "You can't talk for %d more seconds\n", - (int) (host_client->lockedtill - - Sys_DoubleTime () )); + "You can't talk for %d more seconds\n", + (int) (host_client->lockedtill - realtime)); return; } tmp = host_client->whensaidhead - fp_messages + 1; @@ -811,7 +810,7 @@ SV_Say (qboolean team) if (!sv.paused && host_client->whensaid[tmp] && (realtime - host_client->whensaid[tmp] < fp_persecond)) { - host_client->lockedtill = Sys_DoubleTime () + fp_secondsdead; + host_client->lockedtill = realtime + fp_secondsdead; if (fp_msg[0]) SV_ClientPrintf (host_client, PRINT_CHAT, "FloodProt: %s\n", fp_msg); @@ -1506,7 +1505,7 @@ SV_RunCmd (usercmd_t *ucmd, qboolean inside) SVfloat (sv_player, button2) = (ucmd->buttons & 2) >> 1; if (ucmd->impulse) SVfloat (sv_player, impulse) = ucmd->impulse; - if (host_client->cuff_time > Sys_DoubleTime() ) + if (host_client->cuff_time > realtime) SVfloat (sv_player, button0) = SVfloat (sv_player, impulse) = 0; //