eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

add cl_yieldcpu, fix setmodel with NULL pointer

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3869 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2011-07-13 05:48:09 +00:00
parent 987a86a4ac
commit a0e7300da2
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/client/cl_main.c
View file

@ -49,6 +49,7 @@ cvar_t cl_sbar = CVARFC("cl_sbar", "0", CVAR_ARCHIVE, CL_Sbar_Callback);
cvar_t cl_hudswap = CVARF("cl_hudswap", "0", CVAR_ARCHIVE); cvar_t cl_hudswap = CVARF("cl_hudswap", "0", CVAR_ARCHIVE);
cvar_t cl_maxfps = CVARF("cl_maxfps", "500", CVAR_ARCHIVE); cvar_t cl_maxfps = CVARF("cl_maxfps", "500", CVAR_ARCHIVE);
cvar_t cl_idlefps = CVARF("cl_idlefps", "0", CVAR_ARCHIVE); cvar_t cl_idlefps = CVARF("cl_idlefps", "0", CVAR_ARCHIVE);
cvar_t cl_yieldcpu = CVARF("cl_yieldcpu", "0", CVAR_ARCHIVE);
cvar_t cl_nopext = CVARF("cl_nopext", "0", CVAR_ARCHIVE); cvar_t cl_nopext = CVARF("cl_nopext", "0", CVAR_ARCHIVE);
cvar_t cl_pext_mask = CVAR("cl_pext_mask", "0xffffffff"); cvar_t cl_pext_mask = CVAR("cl_pext_mask", "0xffffffff");
cvar_t cl_nolerp = CVAR("cl_nolerp", "2"); cvar_t cl_nolerp = CVAR("cl_nolerp", "2");
@ -3002,6 +3003,7 @@ void CL_Init (void)
Cvar_Register (&cl_hudswap, cl_screengroup); Cvar_Register (&cl_hudswap, cl_screengroup);
Cvar_Register (&cl_maxfps, cl_screengroup); Cvar_Register (&cl_maxfps, cl_screengroup);
Cvar_Register (&cl_idlefps, cl_screengroup); Cvar_Register (&cl_idlefps, cl_screengroup);
Cvar_Register (&cl_yieldcpu, cl_screengroup);
Cvar_Register (&cl_timeout, cl_controlgroup); Cvar_Register (&cl_timeout, cl_controlgroup);
Cvar_Register (&lookspring, cl_inputgroup); Cvar_Register (&lookspring, cl_inputgroup);
Cvar_Register (&lookstrafe, cl_inputgroup); Cvar_Register (&lookstrafe, cl_inputgroup);
@ -3452,7 +3454,7 @@ double Host_Frame (double time)
realtime += spare/1000; //don't use it all! realtime += spare/1000; //don't use it all!
spare = CL_FilterTime((realtime - oldrealtime)*1000, maxfps, maxfpsignoreserver); spare = CL_FilterTime((realtime - oldrealtime)*1000, maxfps, maxfpsignoreserver);
if (!spare) if (!spare)
return 0; return cl_yieldcpu.ival ? (1.0 / maxfps - (realtime - oldrealtime)) : 0;
if (spare < 0 || cls.state < ca_onserver) if (spare < 0 || cls.state < ca_onserver)
spare = 0; //uncapped. spare = 0; //uncapped.
if (spare > cl_sparemsec.ival) if (spare > cl_sparemsec.ival)

2
engine/qclib/progslib.h
View file

@ -15,7 +15,7 @@
#endif #endif
#if defined(_M_IX86) || defined(__i386__) #if defined(_M_IX86) || defined(__i386__)
//#define QCJIT #define QCJIT
#endif #endif
#ifdef QCJIT #ifdef QCJIT

2
engine/server/pr_cmds.c
View file

@ -2132,7 +2132,7 @@ void PF_setmodel_Internal (progfuncs_t *prinst, edict_t *e, char *m)
e->v->modelindex = i; e->v->modelindex = i;
// if it is an inline model, get the size information for it // if it is an inline model, get the size information for it
if (m[0] == '*' || (*m&&progstype == PROG_H2)) if (m && (m[0] == '*' || (*m&&progstype == PROG_H2)))
{ {
mod = Mod_ForName (m, false); mod = Mod_ForName (m, false);
if (mod) if (mod)