OPC->_float = OPA->_float < OPB->_float;
break;
case OP_AND:
- OPC->_float = OPA->_float && OPB->_float;
+ OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) && FLOAT_IS_TRUE_FOR_INT(OPB->_int); // TODO change this back to float, and add AND_I to be used by fteqcc for anything not a float
break;
case OP_OR:
- OPC->_float = OPA->_float || OPB->_float;
+ OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) || FLOAT_IS_TRUE_FOR_INT(OPB->_int); // TODO change this back to float, and add OR_I to be used by fteqcc for anything not a float
break;
case OP_NOT_F:
- OPC->_float = !OPA->_float;
+ OPC->_float = !FLOAT_IS_TRUE_FOR_INT(OPA->_int);
break;
case OP_NOT_V:
OPC->_float = !OPA->vector[0] && !OPA->vector[1] && !OPA->vector[2];
case OP_ADDRESS:
#if PRVMBOUNDSCHECK
+ if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
+ {
+ prog->xfunction->profile += (st - startst);
+ prog->xstatement = st - prog->statements;
+ PRVM_ERROR ("%s Progs attempted to address an out of bounds edict number", PRVM_NAME);
+ goto cleanup;
+ }
if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->progs->entityfields))
{
prog->xfunction->profile += (st - startst);
case OP_LOAD_S:
case OP_LOAD_FNC:
#if PRVMBOUNDSCHECK
- if (OPA->edict < 0 || OPA->edict >= prog->edictareasize)
+ if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
{
prog->xfunction->profile += (st - startst);
prog->xstatement = st - prog->statements;
case OP_LOAD_V:
#if PRVMBOUNDSCHECK
- if (OPA->edict < 0 || OPA->edict >= prog->edictareasize)
+ if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
{
prog->xfunction->profile += (st - startst);
prog->xstatement = st - prog->statements;
//==================
case OP_IFNOT:
- if (!OPA->_float)
- // TODO add an "int-ifnot"
+ if(!FLOAT_IS_TRUE_FOR_INT(OPA->_int))
+ // TODO add an "int-if", and change this one to OPA->_float
// although mostly unneeded, thanks to the only float being false being 0x0 and 0x80000000 (negative zero)
// and entity, string, field values can never have that value
{
break;
case OP_IF:
- if (OPA->_float)
- // TODO add an "int-if"
+ if(FLOAT_IS_TRUE_FOR_INT(OPA->_int))
+ // TODO add an "int-if", and change this one, as well as the FLOAT_IS_TRUE_FOR_INT usages, to OPA->_float
// although mostly unneeded, thanks to the only float being false being 0x0 and 0x80000000 (negative zero)
// and entity, string, field values can never have that value
{
break;
case OP_LOAD_I:
#if PRBOUNDSCHECK
- if (OPA->edict < 0 || OPA->edict >= pr_edictareasize)
+ if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
{
prog->xfunction->profile += (st - startst);
prog->xstatement = st - prog->statements;