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

Fixing a couple of warnings.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1446 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-10-07 02:14:22 +00:00
parent b73f794d7d
commit cb7acda2dd
6 changed files with 41 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
engine/common/sys.h
View file

@ -55,6 +55,7 @@ void VARGS Sys_Printf (char *fmt, ...);
void Sys_Quit (void); void Sys_Quit (void);
unsigned int Sys_Milliseconds (void);
double Sys_DoubleTime (void); double Sys_DoubleTime (void);
char *Sys_ConsoleInput (void); char *Sys_ConsoleInput (void);

1
engine/common/vm.h
View file

@ -41,6 +41,7 @@ void Plug_Init(void);
void Plug_SBar(void); void Plug_SBar(void);
void Plug_DrawReloadImages(void); void Plug_DrawReloadImages(void);
int Plug_ConnectionlessClientPacket(char *buffer, int size);
#endif #endif

6
engine/qclib/execloop.h
View file

@ -388,7 +388,7 @@ reeval:
//get a pointer to a field var //get a pointer to a field var
case OP_ADDRESS: case OP_ADDRESS:
if ((unsigned)OPA->edict >= maxedicts) if ((unsigned)OPA->edict >= (unsigned)maxedicts)
PR_RunError (progfuncs, "OP_ADDRESS references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name); PR_RunError (progfuncs, "OP_ADDRESS references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name);
ed = PROG_TO_EDICT(progfuncs, OPA->edict); ed = PROG_TO_EDICT(progfuncs, OPA->edict);
#ifdef PARANOID #ifdef PARANOID
@ -409,7 +409,7 @@ reeval:
case OP_LOAD_ENT: case OP_LOAD_ENT:
case OP_LOAD_S: case OP_LOAD_S:
case OP_LOAD_FNC: case OP_LOAD_FNC:
if ((unsigned)OPA->edict >= maxedicts) if ((unsigned)OPA->edict >= (unsigned)maxedicts)
PR_RunError (progfuncs, "OP_LOAD references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name); PR_RunError (progfuncs, "OP_LOAD references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name);
ed = PROG_TO_EDICT(progfuncs, OPA->edict); ed = PROG_TO_EDICT(progfuncs, OPA->edict);
#ifdef PARANOID #ifdef PARANOID
@ -420,7 +420,7 @@ reeval:
break; break;
case OP_LOAD_V: case OP_LOAD_V:
if ((unsigned)OPA->edict >= maxedicts) if ((unsigned)OPA->edict >= (unsigned)maxedicts)
PR_RunError (progfuncs, "OP_LOAD_V references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name); PR_RunError (progfuncs, "OP_LOAD_V references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name);
ed = PROG_TO_EDICT(progfuncs, OPA->edict); ed = PROG_TO_EDICT(progfuncs, OPA->edict);
#ifdef PARANOID #ifdef PARANOID

12
engine/qclib/execloop16d.h
View file

@ -388,6 +388,8 @@ reeval:
//get a pointer to a field var //get a pointer to a field var
case OP_ADDRESS: case OP_ADDRESS:
if ((unsigned)OPA->edict >= (unsigned)maxedicts)
PR_RunError (progfuncs, "OP_ADDRESS references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name);
ed = PROG_TO_EDICT(progfuncs, OPA->edict); ed = PROG_TO_EDICT(progfuncs, OPA->edict);
#ifdef PARANOID #ifdef PARANOID
NUM_FOR_EDICT(ed); // make sure it's in range NUM_FOR_EDICT(ed); // make sure it's in range
@ -407,6 +409,8 @@ reeval:
case OP_LOAD_ENT: case OP_LOAD_ENT:
case OP_LOAD_S: case OP_LOAD_S:
case OP_LOAD_FNC: case OP_LOAD_FNC:
if ((unsigned)OPA->edict >= (unsigned)maxedicts)
PR_RunError (progfuncs, "OP_LOAD references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name);
ed = PROG_TO_EDICT(progfuncs, OPA->edict); ed = PROG_TO_EDICT(progfuncs, OPA->edict);
#ifdef PARANOID #ifdef PARANOID
NUM_FOR_EDICT(ed); // make sure it's in range NUM_FOR_EDICT(ed); // make sure it's in range
@ -416,6 +420,8 @@ reeval:
break; break;
case OP_LOAD_V: case OP_LOAD_V:
if ((unsigned)OPA->edict >= (unsigned)maxedicts)
PR_RunError (progfuncs, "OP_LOAD_V references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name);
ed = PROG_TO_EDICT(progfuncs, OPA->edict); ed = PROG_TO_EDICT(progfuncs, OPA->edict);
#ifdef PARANOID #ifdef PARANOID
NUM_FOR_EDICT(ed); // make sure it's in range NUM_FOR_EDICT(ed); // make sure it's in range
@ -518,6 +524,12 @@ reeval:
if (newf->first_statement < 0) if (newf->first_statement < 0)
{ // negative statements are built in functions { // negative statements are built in functions
if (pr_typecurrent != 0)
{
PR_MoveParms(progfuncs, 0, pr_typecurrent);
PR_SwitchProgs(progfuncs, 0);
}
i = -newf->first_statement; i = -newf->first_statement;
// p = pr_typecurrent; // p = pr_typecurrent;
progfuncs->lastcalledbuiltinnumber = i; progfuncs->lastcalledbuiltinnumber = i;

12
engine/qclib/execloop32.h
View file

@ -388,6 +388,8 @@ reeval:
//get a pointer to a field var //get a pointer to a field var
case OP_ADDRESS: case OP_ADDRESS:
if ((unsigned)OPA->edict >= (unsigned)maxedicts)
PR_RunError (progfuncs, "OP_ADDRESS references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name);
ed = PROG_TO_EDICT(progfuncs, OPA->edict); ed = PROG_TO_EDICT(progfuncs, OPA->edict);
#ifdef PARANOID #ifdef PARANOID
NUM_FOR_EDICT(ed); // make sure it's in range NUM_FOR_EDICT(ed); // make sure it's in range
@ -407,6 +409,8 @@ reeval:
case OP_LOAD_ENT: case OP_LOAD_ENT:
case OP_LOAD_S: case OP_LOAD_S:
case OP_LOAD_FNC: case OP_LOAD_FNC:
if ((unsigned)OPA->edict >= (unsigned)maxedicts)
PR_RunError (progfuncs, "OP_LOAD references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name);
ed = PROG_TO_EDICT(progfuncs, OPA->edict); ed = PROG_TO_EDICT(progfuncs, OPA->edict);
#ifdef PARANOID #ifdef PARANOID
NUM_FOR_EDICT(ed); // make sure it's in range NUM_FOR_EDICT(ed); // make sure it's in range
@ -416,6 +420,8 @@ reeval:
break; break;
case OP_LOAD_V: case OP_LOAD_V:
if ((unsigned)OPA->edict >= (unsigned)maxedicts)
PR_RunError (progfuncs, "OP_LOAD_V references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name);
ed = PROG_TO_EDICT(progfuncs, OPA->edict); ed = PROG_TO_EDICT(progfuncs, OPA->edict);
#ifdef PARANOID #ifdef PARANOID
NUM_FOR_EDICT(ed); // make sure it's in range NUM_FOR_EDICT(ed); // make sure it's in range
@ -518,6 +524,12 @@ reeval:
if (newf->first_statement < 0) if (newf->first_statement < 0)
{ // negative statements are built in functions { // negative statements are built in functions
if (pr_typecurrent != 0)
{
PR_MoveParms(progfuncs, 0, pr_typecurrent);
PR_SwitchProgs(progfuncs, 0);
}
i = -newf->first_statement; i = -newf->first_statement;
// p = pr_typecurrent; // p = pr_typecurrent;
progfuncs->lastcalledbuiltinnumber = i; progfuncs->lastcalledbuiltinnumber = i;

12
engine/qclib/execloop32d.h
View file

@ -388,6 +388,8 @@ reeval:
//get a pointer to a field var //get a pointer to a field var
case OP_ADDRESS: case OP_ADDRESS:
if ((unsigned)OPA->edict >= (unsigned)maxedicts)
PR_RunError (progfuncs, "OP_ADDRESS references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name);
ed = PROG_TO_EDICT(progfuncs, OPA->edict); ed = PROG_TO_EDICT(progfuncs, OPA->edict);
#ifdef PARANOID #ifdef PARANOID
NUM_FOR_EDICT(ed); // make sure it's in range NUM_FOR_EDICT(ed); // make sure it's in range
@ -407,6 +409,8 @@ reeval:
case OP_LOAD_ENT: case OP_LOAD_ENT:
case OP_LOAD_S: case OP_LOAD_S:
case OP_LOAD_FNC: case OP_LOAD_FNC:
if ((unsigned)OPA->edict >= (unsigned)maxedicts)
PR_RunError (progfuncs, "OP_LOAD references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name);
ed = PROG_TO_EDICT(progfuncs, OPA->edict); ed = PROG_TO_EDICT(progfuncs, OPA->edict);
#ifdef PARANOID #ifdef PARANOID
NUM_FOR_EDICT(ed); // make sure it's in range NUM_FOR_EDICT(ed); // make sure it's in range
@ -416,6 +420,8 @@ reeval:
break; break;
case OP_LOAD_V: case OP_LOAD_V:
if ((unsigned)OPA->edict >= (unsigned)maxedicts)
PR_RunError (progfuncs, "OP_LOAD_V references invalid entity in %s", progfuncs->stringtable + pr_xfunction->s_name);
ed = PROG_TO_EDICT(progfuncs, OPA->edict); ed = PROG_TO_EDICT(progfuncs, OPA->edict);
#ifdef PARANOID #ifdef PARANOID
NUM_FOR_EDICT(ed); // make sure it's in range NUM_FOR_EDICT(ed); // make sure it's in range
@ -518,6 +524,12 @@ reeval:
if (newf->first_statement < 0) if (newf->first_statement < 0)
{ // negative statements are built in functions { // negative statements are built in functions
if (pr_typecurrent != 0)
{
PR_MoveParms(progfuncs, 0, pr_typecurrent);
PR_SwitchProgs(progfuncs, 0);
}
i = -newf->first_statement; i = -newf->first_statement;
// p = pr_typecurrent; // p = pr_typecurrent;
progfuncs->lastcalledbuiltinnumber = i; progfuncs->lastcalledbuiltinnumber = i;