X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=prvm_execprogram.h;h=d125cd7eeb2266cfb294b2c1699e86b8d2c4f330;hb=190a74cbf9792407ff3fc9abc9654f933fdeda8a;hp=499820ce079d5b31db4d435e705678b8bab756c2;hpb=8ba95d27a44c667568ae9a5aa1b4b69d75a9d565;p=xonotic%2Fdarkplaces.git

diff --git a/prvm_execprogram.h b/prvm_execprogram.h
index 499820ce..d125cd7e 100644
--- a/prvm_execprogram.h
+++ b/prvm_execprogram.h
@@ -189,16 +189,16 @@
 					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 = (qbyte *)((int *)ed->fields.vp + OPB->_int) - (qbyte *)prog->edictsfields;
 				break;
 
 			case OP_LOAD_F:
@@ -217,7 +217,7 @@
 				}
 #endif
 				ed = PRVM_PROG_TO_EDICT(OPA->edict);
-				OPC->_int = ((prvm_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:
@@ -232,9 +232,9 @@
 				}
 #endif
 				ed = PRVM_PROG_TO_EDICT(OPA->edict);
-				OPC->vector[0] = ((prvm_eval_t *)((int *)ed->v + OPB->_int))->vector[0];
-				OPC->vector[1] = ((prvm_eval_t *)((int *)ed->v + OPB->_int))->vector[1];
-				OPC->vector[2] = ((prvm_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;
 
 		//==================
@@ -292,9 +292,9 @@
 				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)
@@ -304,20 +304,20 @@
 				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")) = *prog->time + 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);
 				break;
-				
+
 // LordHavoc: to be enabled when Progs version 7 (or whatever it will be numbered) is finalized
 /*
 			case OP_ADD_I:
@@ -482,7 +482,7 @@
 					return;
 				}
 #endif
-				ptr = (eval_t *)((qbyte *)sv.edictsfields + OPB->_int);
+				ptr = (prvm_eval_t *)((qbyte *)prog->edictsfields + OPB->_int);
 				ptr->_int = OPA->_int;
 				break;
 			case OP_LOAD_I:
@@ -504,8 +504,8 @@
 					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: