OPC->_float = !OPA->vector[0] && !OPA->vector[1] && !OPA->vector[2];
break;
case OP_NOT_S:
- OPC->_float = !OPA->string || !*PR_GetString(OPA->string);
+ OPC->_float = !OPA->string || !*PRVM_GetString(OPA->string);
break;
case OP_NOT_FNC:
OPC->_float = !OPA->function;
prog->xfunction->profile += profile - startprofile;
startprofile = profile;
prog->xstatement = st - prog->statements;
- PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)\n", PRVM_NAME, OPB->_int);
+ PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int);
return;
}
#endif
- ptr = (prvm_eval_t *)((qbyte *)prog->edictsfields + OPB->_int);
+ ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
ptr->_int = OPA->_int;
break;
case OP_STOREP_V:
prog->xfunction->profile += profile - startprofile;
startprofile = profile;
prog->xstatement = st - prog->statements;
- PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)\n", PRVM_NAME, OPB->_int);
+ PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int);
return;
}
#endif
- ptr = (prvm_eval_t *)((qbyte *)prog->edictsfields + OPB->_int);
+ ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
ptr->vector[0] = OPA->vector[0];
ptr->vector[1] = OPA->vector[1];
ptr->vector[2] = OPA->vector[2];
prog->xfunction->profile += profile - startprofile;
startprofile = profile;
prog->xstatement = st - prog->statements;
- PRVM_ERROR("%s attempted to address an invalid field (%i) in an edict\n", PRVM_NAME, OPB->_int);
+ PRVM_ERROR("%s attempted to address an invalid field (%i) in an edict", PRVM_NAME, OPB->_int);
return;
}
#endif
- /*if (OPA->edict == 0 && sv.state == ss_active)
+ if (OPA->edict == 0 && !prog->allowworldwrites)
{
prog->xfunction->profile += profile - startprofile;
startprofile = profile;
prog->xstatement = st - prog->statements;
- Host_Error("assignment to world entity in %s", PRVM_NAME);
+ PRVM_ERROR("forbidden assignment to null/world entity in %s", PRVM_NAME);
return;
- }*/
+ }
ed = PRVM_PROG_TO_EDICT(OPA->edict);
- OPC->_int = (qbyte *)((int *)ed->v + OPB->_int) - (qbyte *)prog->edictsfields;
+ OPC->_int = (unsigned char *)((int *)ed->fields.vp + OPB->_int) - (unsigned char *)prog->edictsfields;
break;
case OP_LOAD_F:
prog->xfunction->profile += profile - startprofile;
startprofile = profile;
prog->xstatement = st - prog->statements;
- PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)\n", PRVM_NAME, OPB->_int);
+ PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)", PRVM_NAME, OPB->_int);
return;
}
#endif
ed = PRVM_PROG_TO_EDICT(OPA->edict);
- OPC->_int = ((eval_t *)((int *)ed->v + OPB->_int))->_int;
+ OPC->_int = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->_int;
break;
case OP_LOAD_V:
prog->xfunction->profile += profile - startprofile;
startprofile = profile;
prog->xstatement = st - prog->statements;
- PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)\n", PRVM_NAME, OPB->_int);
+ PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)", PRVM_NAME, OPB->_int);
return;
}
#endif
ed = PRVM_PROG_TO_EDICT(OPA->edict);
- OPC->vector[0] = ((eval_t *)((int *)ed->v + OPB->_int))->vector[0];
- OPC->vector[1] = ((eval_t *)((int *)ed->v + OPB->_int))->vector[1];
- OPC->vector[2] = ((eval_t *)((int *)ed->v + OPB->_int))->vector[2];
+ OPC->vector[0] = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->vector[0];
+ OPC->vector[1] = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->vector[1];
+ OPC->vector[2] = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->vector[2];
break;
//==================
PRVM_ERROR("NULL function in %s", PRVM_NAME);
newf = &prog->functions[OPA->function];
+ newf->callcount++;
if (newf->first_statement < 0)
{
startprofile = profile;
prog->xstatement = st - prog->statements;
- prog->globals[OFS_RETURN] = prog->globals[(unsigned short) st->a];
- prog->globals[OFS_RETURN+1] = prog->globals[(unsigned short) st->a+1];
- prog->globals[OFS_RETURN+2] = prog->globals[(unsigned short) st->a+2];
+ prog->globals.generic[OFS_RETURN] = prog->globals.generic[(unsigned short) st->a];
+ prog->globals.generic[OFS_RETURN+1] = prog->globals.generic[(unsigned short) st->a+1];
+ prog->globals.generic[OFS_RETURN+2] = prog->globals.generic[(unsigned short) st->a+2];
st = prog->statements + PRVM_LeaveFunction();
if (prog->depth <= exitdepth)
break;
case OP_STATE:
- if(prog->flag & PRVM_OP_STATE)
+ if(prog->flag & PRVM_OP_STATE)
{
prog->xfunction->profile += profile - startprofile;
startprofile = profile;
prog->xstatement = st - prog->statements;
ed = PRVM_PROG_TO_EDICT(PRVM_G_INT(prog->self->ofs));
- PRVM_E_FLOAT(ed,PRVM_ED_FindFieldOffset ("nextthink")) = PRVM_G_FLOAT(PRVM_ED_FindGlobal("time")->ofs*4) + 0.1;
- PRVM_E_FLOAT(ed,PRVM_ED_FindFieldOffset ("frame")) = OPA->_float;
- *(func_t *)((qbyte*)ed->v + PRVM_ED_FindFieldOffset ("think")) = OPB->function;
+ PRVM_E_FLOAT(ed,PRVM_ED_FindField ("nextthink")->ofs) = *prog->time + 0.1;
+ PRVM_E_FLOAT(ed,PRVM_ED_FindField ("frame")->ofs) = OPA->_float;
+ *(func_t *)((float*)ed->fields.vp + PRVM_ED_FindField ("think")->ofs) = OPB->function;
}
else
- PRVM_ERROR("OP_STATE not supported by %s\n", PRVM_NAME);
+ PRVM_ERROR("OP_STATE not supported by %s", PRVM_NAME);
break;
-
+
// LordHavoc: to be enabled when Progs version 7 (or whatever it will be numbered) is finalized
/*
case OP_ADD_I:
pr_xfunction->profile += profile - startprofile;
startprofile = profile;
pr_xstatement = st - pr_statements;
- Host_Error("Progs attempted to write to an out of bounds edict\n");
+ Host_Error("Progs attempted to write to an out of bounds edict");
return;
}
#endif
- ptr = (eval_t *)((qbyte *)sv.edictsfields + OPB->_int);
+ ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
ptr->_int = OPA->_int;
break;
case OP_LOAD_I:
pr_xfunction->profile += profile - startprofile;
startprofile = profile;
pr_xstatement = st - pr_statements;
- Host_Error("Progs attempted to read an out of bounds edict number\n");
+ Host_Error("Progs attempted to read an out of bounds edict number");
return;
}
if (OPB->_int < 0 || OPB->_int >= progs->entityfields)
pr_xfunction->profile += profile - startprofile;
startprofile = profile;
pr_xstatement = st - pr_statements;
- Host_Error("Progs attempted to read an invalid field in an edict\n");
+ Host_Error("Progs attempted to read an invalid field in an edict");
return;
}
#endif
- ed = PROG_TO_EDICT(OPA->edict);
- OPC->_int = ((eval_t *)((int *)ed->v + OPB->_int))->_int;
+ ed = PRVM_PROG_TO_EDICT(OPA->edict);
+ OPC->_int = ((prvm_eval_t *)((int *)ed->v + OPB->_int))->_int;
break;
case OP_GSTOREP_I:
pr_xfunction->profile += profile - startprofile;
startprofile = profile;
pr_xstatement = st - pr_statements;
- Host_Error("Progs attempted to write to an invalid indexed global\n");
+ Host_Error("Progs attempted to write to an invalid indexed global");
return;
}
#endif
pr_xfunction->profile += profile - startprofile;
startprofile = profile;
pr_xstatement = st - pr_statements;
- Host_Error("Progs attempted to write to an invalid indexed global\n");
+ Host_Error("Progs attempted to write to an invalid indexed global");
return;
}
#endif
pr_xfunction->profile += profile - startprofile;
startprofile = profile;
pr_xstatement = st - pr_statements;
- Host_Error("Progs attempted to address an out of bounds global\n");
+ Host_Error("Progs attempted to address an out of bounds global");
return;
}
#endif
pr_xfunction->profile += profile - startprofile;
startprofile = profile;
pr_xstatement = st - pr_statements;
- Host_Error("Progs attempted to read an invalid indexed global\n");
+ Host_Error("Progs attempted to read an invalid indexed global");
return;
}
#endif
pr_xfunction->profile += profile - startprofile;
startprofile = profile;
pr_xstatement = st - pr_statements;
- Host_Error("Progs attempted to read an invalid indexed global\n");
+ Host_Error("Progs attempted to read an invalid indexed global");
return;
}
#endif
pr_xfunction->profile += profile - startprofile;
startprofile = profile;
pr_xstatement = st - pr_statements;
- Host_Error("Progs boundcheck failed at line number %d, value is < 0 or >= %d\n", st->b, st->c);
+ Host_Error("Progs boundcheck failed at line number %d, value is < 0 or >= %d", st->b, st->c);
return;
}
break;
projects / xonotic / darkplaces.git / blobdiff