nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-01-31 04:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix some compile issues

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5816 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-04-17 14:00:51 +00:00
parent 6bb6acde94
commit ee70a255b4
4 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/client/cl_parse.c
View file

@ -3379,8 +3379,10 @@ static void CLQW_ParseServerData (void)
for (pnum = 0; pnum < cl.splitclients; pnum++)
{
cl.playerview[pnum].spectator = true;
#ifdef QUAKESTATS
if (cls.z_ext & Z_EXT_VIEWHEIGHT)
cl.playerview[pnum].viewheight = cl.playerview[pnum].statsf[STAT_VIEWHEIGHT];
#endif
cl.playerview[pnum].playernum = (qbyte)MSG_ReadByte();
if (cl.playerview[pnum].playernum >= cl.allocated_client_slots)
Host_EndGame("unsupported local player slot\n");
@ -3395,8 +3397,10 @@ static void CLQW_ParseServerData (void)
{
if (clnum == MAX_SPLITS)
Host_EndGame("Server sent us over %u seats\n", MAX_SPLITS);
#ifdef QUAKESTATS
if (cls.z_ext & Z_EXT_VIEWHEIGHT)
cl.playerview[pnum].viewheight = cl.playerview[pnum].statsf[STAT_VIEWHEIGHT];
#endif
cl.playerview[clnum].playernum = pnum;
if (cl.playerview[clnum].playernum & 128)
{

23
engine/client/m_options.c
View file

@ -4071,33 +4071,34 @@ static qboolean M_ModelViewerKey(struct menucustom_s *c, struct emenu_s *m, int
return true;
}
#ifdef RAGDOLL
void M_Modelviewer_Shutdown(struct emenu_s *menu)
{
modelview_t *mv = menu->data;
rag_removedeltaent(&mv->ragent);
skel_reset(&mv->ragworld);
World_RBE_Shutdown(&mv->ragworld);
}
void M_Modelviewer_Reset(struct menu_s *cmenu)
{
emenu_t *menu = (emenu_t*)cmenu;
modelview_t *mv = menu->data;
mv->ragworld.worldmodel = NULL; //already went away
#ifdef RAGDOLL
rag_removedeltaent(&mv->ragent);
skel_reset(&mv->ragworld);
World_RBE_Shutdown(&mv->ragworld);
#endif
//we still want it.
mv->ragworld.worldmodel = NULL;//Mod_ForName("", MLV_SILENT);
// World_RBE_Start(&mv->ragworld);
}
#ifdef RAGDOLL
static void M_Modelviewer_Shutdown(struct emenu_s *menu)
{
modelview_t *mv = menu->data;
rag_removedeltaent(&mv->ragent);
skel_reset(&mv->ragworld);
World_RBE_Shutdown(&mv->ragworld);
}
//haxors, for skeletal objects+RBE
char *PDECL M_Modelviewer_AddString(pubprogfuncs_t *prinst, const char *val, int minlength, pbool demarkup)
static char *PDECL M_Modelviewer_AddString(pubprogfuncs_t *prinst, const char *val, int minlength, pbool demarkup)
{
return Z_Malloc(minlength);
}
struct edict_s *PDECL M_Modelviewer_ProgsToEdict(pubprogfuncs_t *prinst, int num)
static struct edict_s *PDECL M_Modelviewer_ProgsToEdict(pubprogfuncs_t *prinst, int num)
{
return (struct edict_s*)prinst->edicttable[num];
}

2
engine/common/bothdefs.h
View file

@ -320,7 +320,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#endif
// #undef RTLIGHTS
#undef HEADLESSQUAKE
#ifndef NO_FREETYPE
#define NO_FREETYPE
#endif
#endif
#ifdef WINRT
//microsoft do not support winsock any more.

2
engine/common/fs.c
View file

@ -28,8 +28,10 @@ static cvar_t com_fs_cache = CVARF("fs_cache", IFMINIMAL("2","1"), CVAR_ARCHIV
static cvar_t fs_noreexec = CVARD("fs_noreexec", "0", "Disables automatic re-execing configs on gamedir switches.\nThis means your cvar defaults etc may be from the wrong mod, and cfg_save will leave that stuff corrupted!");
static cvar_t cfg_reload_on_gamedir = CVAR("cfg_reload_on_gamedir", "1");
static cvar_t fs_game = CVARAFCD("fs_game"/*q3*/, "", "game"/*q2/qs*/, CVAR_NOSAVE|CVAR_NORESET, fs_game_callback, "Provided for Q2 compat.");
#ifdef Q2SERVER
static cvar_t fs_gamedir = CVARFD("fs_gamedir", "", CVAR_NOUNSAFEEXPAND|CVAR_NOSET|CVAR_NOSAVE, "Provided for Q2 compat.");
static cvar_t fs_basedir = CVARFD("fs_basedir", "", CVAR_NOUNSAFEEXPAND|CVAR_NOSET|CVAR_NOSAVE, "Provided for Q2 compat.");
#endif
static cvar_t dpcompat_ignoremodificationtimes = CVARAFD("fs_packageprioritisation", "1", "dpcompat_ignoremodificationtimes", CVAR_NOUNSAFEEXPAND|CVAR_NOSAVE, "Favours the package that is:\n0: Most recently modified\n1: Is alphabetically last (favour z over a, 9 over 0).");
int active_fs_cachetype;
static int fs_referencetype;