X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=pr_execprogram.h;h=f421e22c1427b8957e69688282f9273ca5b53280;hp=838a0036511664769746fbf7fe71f1f723aa3d40;hb=ec327370c5506f6f31adbca2eff03e0e2de467cb;hpb=c4ee1bbcc6b2f917465f07269ad09942bbf40849

diff --git a/pr_execprogram.h b/pr_execprogram.h
index 838a0036..f421e22c 100644
--- a/pr_execprogram.h
+++ b/pr_execprogram.h
@@ -1,10 +1,13 @@
+
+// This code isn't #ifdef/#define protectable, don't try.
+
 		while (1)
 		{
 			st++;
 			if (++profile > 1000000) // LordHavoc: increased runaway loop limit 10x
 			{
 				pr_xstatement = st - pr_statements;
-				PR_RunError ("runaway loop error");
+				Host_Error ("runaway loop error");
 			}
 
 #if PRTRACE
@@ -79,13 +82,13 @@
 				OPC->_float = !OPA->vector[0] && !OPA->vector[1] && !OPA->vector[2];
 				break;
 			case OP_NOT_S:
-				OPC->_float = !OPA->string || !pr_strings[OPA->string];
+				OPC->_float = !OPA->string || !*PR_GetString(OPA->string);
 				break;
 			case OP_NOT_FNC:
 				OPC->_float = !OPA->function;
 				break;
 			case OP_NOT_ENT:
-				OPC->_float = (PROG_TO_EDICT(OPA->edict) == sv.edicts);
+				OPC->_float = (OPA->edict == 0);
 				break;
 			case OP_EQ_F:
 				OPC->_float = OPA->_float == OPB->_float;
@@ -94,7 +97,7 @@
 				OPC->_float = (OPA->vector[0] == OPB->vector[0]) && (OPA->vector[1] == OPB->vector[1]) && (OPA->vector[2] == OPB->vector[2]);
 				break;
 			case OP_EQ_S:
-				OPC->_float = !strcmp(pr_strings+OPA->string,pr_strings+OPB->string);
+				OPC->_float = !strcmp(PR_GetString(OPA->string),PR_GetString(OPB->string));
 				break;
 			case OP_EQ_E:
 				OPC->_float = OPA->_int == OPB->_int;
@@ -109,7 +112,7 @@
 				OPC->_float = (OPA->vector[0] != OPB->vector[0]) || (OPA->vector[1] != OPB->vector[1]) || (OPA->vector[2] != OPB->vector[2]);
 				break;
 			case OP_NE_S:
-				OPC->_float = strcmp(pr_strings+OPA->string,pr_strings+OPB->string);
+				OPC->_float = strcmp(PR_GetString(OPA->string),PR_GetString(OPB->string));
 				break;
 			case OP_NE_E:
 				OPC->_float = OPA->_int != OPB->_int;
@@ -127,9 +130,9 @@
 				OPB->_int = OPA->_int;
 				break;
 			case OP_STORE_V:
-				OPB->vector[0] = OPA->vector[0];
-				OPB->vector[1] = OPA->vector[1];
-				OPB->vector[2] = OPA->vector[2];
+				OPB->ivector[0] = OPA->ivector[0];
+				OPB->ivector[1] = OPA->ivector[1];
+				OPB->ivector[2] = OPA->ivector[2];
 				break;
 
 			case OP_STOREP_F:
@@ -141,17 +144,11 @@
 				if (OPB->_int < 0 || OPB->_int + 4 > pr_edictareasize)
 				{
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to write to an out of bounds edict\n");
-					return;
-				}
-				if (OPB->_int % pr_edict_size < ((qbyte *)&sv.edicts->v - (qbyte *)sv.edicts))
-				{
-					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to write to an engine edict field\n");
+					Host_Error("Progs attempted to write to an out of bounds edict (%i)\n", OPB->_int);
 					return;
 				}
 #endif
-				ptr = (eval_t *)((qbyte *)sv.edicts + OPB->_int);
+				ptr = (eval_t *)((qbyte *)sv.edictsfields + OPB->_int);
 				ptr->_int = OPA->_int;
 				break;
 			case OP_STOREP_V:
@@ -159,55 +156,32 @@
 				if (OPB->_int < 0 || OPB->_int + 12 > pr_edictareasize)
 				{
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to write to an out of bounds edict\n");
+					Host_Error("Progs attempted to write to an out of bounds edict (%i)\n", OPB->_int);
 					return;
 				}
 #endif
-				ptr = (eval_t *)((qbyte *)sv.edicts + OPB->_int);
+				ptr = (eval_t *)((qbyte *)sv.edictsfields + OPB->_int);
 				ptr->vector[0] = OPA->vector[0];
 				ptr->vector[1] = OPA->vector[1];
 				ptr->vector[2] = OPA->vector[2];
 				break;
 
 			case OP_ADDRESS:
+				pr_xstatement = st - pr_statements;
 #if PRBOUNDSCHECK
-				if (OPA->edict <= 0)
+				if ((unsigned int)(OPB->_int) >= (unsigned int)(progs->entityfields))
 				{
-					if (OPA->edict == 0 && sv.state == ss_active)
-					{
-						pr_xstatement = st - pr_statements;
-						PR_RunError ("assignment to world entity");
-						return;
-					}
-					else
-					{
-						pr_xstatement = st - pr_statements;
-						PR_RunError("Progs attempted to address an out of bounds edict\n");
-						return;
-					}
-				}
-				else if (OPA->edict >= pr_edictareasize)
-				{
-					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to address an out of bounds edict\n");
+					Host_Error("Progs attempted to address an invalid field (%i) in an edict\n", OPB->_int);
 					return;
 				}
-				if (OPB->_int < 0 || OPB->_int >= progs->entityfields)
-				{
-					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to address an invalid field in an edict\n");
-					return;
-				}
-#else
+#endif
 				if (OPA->edict == 0 && sv.state == ss_active)
 				{
-					pr_xstatement = st - pr_statements;
-					PR_RunError ("assignment to world entity");
+					Host_Error ("assignment to world entity");
 					return;
 				}
-#endif
 				ed = PROG_TO_EDICT(OPA->edict);
-				OPC->_int = (qbyte *)((int *)&ed->v + OPB->_int) - (qbyte *)sv.edicts;
+				OPC->_int = (qbyte *)((int *)ed->v + OPB->_int) - (qbyte *)sv.edictsfields;
 				break;
 
 			case OP_LOAD_F:
@@ -215,43 +189,31 @@
 			case OP_LOAD_ENT:
 			case OP_LOAD_S:
 			case OP_LOAD_FNC:
+				pr_xstatement = st - pr_statements;
 #if PRBOUNDSCHECK
-				if (OPA->edict < 0 || OPA->edict >= pr_edictareasize)
-				{
-					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to read an out of bounds edict number\n");
-					return;
-				}
-				if (OPB->_int < 0 || OPB->_int >= progs->entityfields)
+				if ((unsigned int)(OPB->_int) >= (unsigned int)(progs->entityfields))
 				{
-					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to read an invalid field in an edict\n");
+					Host_Error("Progs attempted to read an invalid field in an edict (%i)\n", OPB->_int);
 					return;
 				}
 #endif
 				ed = PROG_TO_EDICT(OPA->edict);
-				OPC->_int = ((eval_t *)((int *)&ed->v + OPB->_int))->_int;
+				OPC->_int = ((eval_t *)((int *)ed->v + OPB->_int))->_int;
 				break;
 
 			case OP_LOAD_V:
+				pr_xstatement = st - pr_statements;
 #if PRBOUNDSCHECK
-				if (OPA->edict < 0 || OPA->edict >= pr_edictareasize)
-				{
-					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to read an out of bounds edict number\n");
-					return;
-				}
 				if (OPB->_int < 0 || OPB->_int + 2 >= progs->entityfields)
 				{
-					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to read an invalid field in an edict\n");
+					Host_Error("Progs attempted to read an invalid field in an edict (%i)\n", OPB->_int);
 					return;
 				}
 #endif
 				ed = 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] = ((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];
 				break;
 
 		//==================
@@ -284,7 +246,7 @@
 				pr_xstatement = st - pr_statements;
 				pr_argc = st->op - OP_CALL0;
 				if (!OPA->function)
-					PR_RunError ("NULL function");
+					Host_Error ("NULL function");
 
 				newf = &pr_functions[OPA->function];
 
@@ -292,7 +254,7 @@
 				{
 					// negative statements are built in functions
 					if ((-newf->first_statement) >= pr_numbuiltins)
-						PR_RunError ("Bad builtin call number");
+						Host_Error ("Bad builtin call number");
 					pr_builtins[-newf->first_statement] ();
 				}
 				else
@@ -314,9 +276,9 @@
 
 			case OP_STATE:
 				ed = PROG_TO_EDICT(pr_global_struct->self);
-				ed->v.nextthink = pr_global_struct->time + 0.1;
-				ed->v.frame = OPA->_float;
-				ed->v.think = OPB->function;
+				ed->v->nextthink = pr_global_struct->time + 0.1;
+				ed->v->frame = OPA->_float;
+				ed->v->think = OPB->function;
 				break;
 
 // LordHavoc: to be enabled when Progs version 7 (or whatever it will be numbered) is finalized
@@ -477,17 +439,11 @@
 				if (OPB->_int < 0 || OPB->_int + 4 > pr_edictareasize)
 				{
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to write to an out of bounds edict\n");
-					return;
-				}
-				if (OPB->_int % pr_edict_size < ((qbyte *)&sv.edicts->v - (qbyte *)sv.edicts))
-				{
-					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to write to an engine edict field\n");
+					Host_Error("Progs attempted to write to an out of bounds edict\n");
 					return;
 				}
 #endif
-				ptr = (eval_t *)((qbyte *)sv.edicts + OPB->_int);
+				ptr = (eval_t *)((qbyte *)sv.edictsfields + OPB->_int);
 				ptr->_int = OPA->_int;
 				break;
 			case OP_LOAD_I:
@@ -495,18 +451,18 @@
 				if (OPA->edict < 0 || OPA->edict >= pr_edictareasize)
 				{
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to read an out of bounds edict number\n");
+					Host_Error("Progs attempted to read an out of bounds edict number\n");
 					return;
 				}
 				if (OPB->_int < 0 || OPB->_int >= progs->entityfields)
 				{
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to read an invalid field in an edict\n");
+					Host_Error("Progs attempted to read an invalid field in an edict\n");
 					return;
 				}
 #endif
 				ed = PROG_TO_EDICT(OPA->edict);
-				OPC->_int = ((eval_t *)((int *)&ed->v + OPB->_int))->_int;
+				OPC->_int = ((eval_t *)((int *)ed->v + OPB->_int))->_int;
 				break;
 
 			case OP_GSTOREP_I:
@@ -519,7 +475,7 @@
 				if (OPB->_int < 0 || OPB->_int >= pr_globaldefs)
 				{
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to write to an invalid indexed global\n");
+					Host_Error("Progs attempted to write to an invalid indexed global\n");
 					return;
 				}
 #endif
@@ -530,7 +486,7 @@
 				if (OPB->_int < 0 || OPB->_int + 2 >= pr_globaldefs)
 				{
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to write to an invalid indexed global\n");
+					Host_Error("Progs attempted to write to an invalid indexed global\n");
 					return;
 				}
 #endif
@@ -545,7 +501,7 @@
 				if (i < 0 || i >= pr_globaldefs)
 				{
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to address an out of bounds global\n");
+					Host_Error("Progs attempted to address an out of bounds global\n");
 					return;
 				}
 #endif
@@ -562,7 +518,7 @@
 				if (OPA->_int < 0 || OPA->_int >= pr_globaldefs)
 				{
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to read an invalid indexed global\n");
+					Host_Error("Progs attempted to read an invalid indexed global\n");
 					return;
 				}
 #endif
@@ -574,7 +530,7 @@
 				if (OPA->_int < 0 || OPA->_int + 2 >= pr_globaldefs)
 				{
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to read an invalid indexed global\n");
+					Host_Error("Progs attempted to read an invalid indexed global\n");
 					return;
 				}
 #endif
@@ -587,7 +543,7 @@
 				if (OPA->_int < 0 || OPA->_int >= st->b)
 				{
 					pr_xstatement = st - pr_statements;
-					PR_RunError("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\n", st->b, st->c);
 					return;
 				}
 				break;
@@ -596,6 +552,7 @@
 
 			default:
 				pr_xstatement = st - pr_statements;
-				PR_RunError ("Bad opcode %i", st->op);
+				Host_Error ("Bad opcode %i", st->op);
 			}
 		}
+