mirror of
https://github.com/nzp-team/fteqw.git
synced 2024-11-26 22:01:50 +00:00
fixing gcc warnings
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@214 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
191d638cce
commit
4f2b56587d
2 changed files with 11 additions and 8 deletions
|
@ -981,7 +981,7 @@ void Q_InitProgs(void)
|
||||||
}
|
}
|
||||||
prnum = 0;
|
prnum = 0;
|
||||||
|
|
||||||
switch (sv.worldmodel->fromgame)
|
switch (sv.worldmodel->fromgame) //spawn functions for - spawn funcs still come from the first progs found.
|
||||||
{
|
{
|
||||||
case fg_quake2:
|
case fg_quake2:
|
||||||
if (COM_FDepthFile("q2bsp.dat", true)!=0x7fffffff)
|
if (COM_FDepthFile("q2bsp.dat", true)!=0x7fffffff)
|
||||||
|
@ -1001,6 +1001,9 @@ void Q_InitProgs(void)
|
||||||
if (COM_FDepthFile("hlbsp.dat", true)!=0x7fffffff)
|
if (COM_FDepthFile("hlbsp.dat", true)!=0x7fffffff)
|
||||||
prnum = AddProgs("hlbsp.dat");
|
prnum = AddProgs("hlbsp.dat");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (prnum>=0)
|
if (prnum>=0)
|
||||||
|
@ -1317,10 +1320,10 @@ char *PF_VarString (progfuncs_t *prinst, int first, globalvars_t *pr_globals)
|
||||||
|
|
||||||
|
|
||||||
//#define RETURN_EDICT(pf, e) (((int *)pr_globals)[OFS_RETURN] = EDICT_TO_PROG(pf, e))
|
//#define RETURN_EDICT(pf, e) (((int *)pr_globals)[OFS_RETURN] = EDICT_TO_PROG(pf, e))
|
||||||
#define RETURN_SSTRING(s) ((char *)((int *)pr_globals)[OFS_RETURN] = PR_SetString(prinst, s)) //static - exe will not change it.
|
#define RETURN_SSTRING(s) (*(char **)&((int *)pr_globals)[OFS_RETURN] = PR_SetString(prinst, s)) //static - exe will not change it.
|
||||||
#define RETURN_TSTRING(s) ((char *)((int *)pr_globals)[OFS_RETURN] = PR_SetString(prinst, s)) //temp (static but cycle buffers?)
|
#define RETURN_TSTRING(s) (*(char **)&((int *)pr_globals)[OFS_RETURN] = PR_SetString(prinst, s)) //temp (static but cycle buffers?)
|
||||||
#define RETURN_CSTRING(s) ((char *)((int *)pr_globals)[OFS_RETURN] = PR_SetString(prinst, s)) //semi-permanant. (hash tables?)
|
#define RETURN_CSTRING(s) (*(char **)&((int *)pr_globals)[OFS_RETURN] = PR_SetString(prinst, s)) //semi-permanant. (hash tables?)
|
||||||
#define RETURN_PSTRING(s) ((char *)((int *)pr_globals)[OFS_RETURN] = PR_NewString(prinst, s)) //permanant
|
#define RETURN_PSTRING(s) (*(char **)&((int *)pr_globals)[OFS_RETURN] = PR_NewString(prinst, s)) //permanant
|
||||||
|
|
||||||
/*
|
/*
|
||||||
===============================================================================
|
===============================================================================
|
||||||
|
@ -3882,7 +3885,7 @@ client_t *Write_GetClient(void)
|
||||||
int entnum;
|
int entnum;
|
||||||
edict_t *ent;
|
edict_t *ent;
|
||||||
|
|
||||||
struct globalvars_s *pr_globals = pr_netglob;
|
// struct globalvars_s *pr_globals = pr_netglob;
|
||||||
|
|
||||||
ent = PROG_TO_EDICT(pr_netprogfuncs, pr_global_struct->msg_entity);
|
ent = PROG_TO_EDICT(pr_netprogfuncs, pr_global_struct->msg_entity);
|
||||||
entnum = NUM_FOR_EDICT(pr_netprogfuncs, ent);
|
entnum = NUM_FOR_EDICT(pr_netprogfuncs, ent);
|
||||||
|
|
|
@ -1514,7 +1514,7 @@ void SV_UpdateToReliableMessages (void)
|
||||||
SZ_Clear (&sv.q2datagram);
|
SZ_Clear (&sv.q2datagram);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _MSC_VER
|
||||||
#pragma optimize( "", off )
|
#pragma optimize( "", off )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1632,7 +1632,7 @@ void SV_SendClientMessages (void)
|
||||||
SV_CleanupEnts();
|
SV_CleanupEnts();
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _MSC_VER
|
||||||
#pragma optimize( "", on )
|
#pragma optimize( "", on )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue