- added position getters/setters to DCoreActor.

Scripting should not be subjected to that awful mixed fixed point format, but we cannot easily swap out the internals without risking breakage all over the place.

source/core/actorlist.cpp

@@ -506,8 +506,78 @@ DEFINE_FIELD_NAMED(DCoreActor, sprext.mdanimcur, mdanimcur)
 DEFINE_FIELD_NAMED(DCoreActor, sprext.angoff, angoff)
 DEFINE_FIELD_NAMED(DCoreActor, sprext.pitch, pitch)
 DEFINE_FIELD_NAMED(DCoreActor, sprext.roll, roll)
-DEFINE_FIELD_NAMED(DCoreActor, sprext.pivot_offset, pivot_offset)
 DEFINE_FIELD_NAMED(DCoreActor, sprext.renderflags, renderflags)
 DEFINE_FIELD_NAMED(DCoreActor, sprext.alpha, alpha)
 DEFINE_FIELD_NAMED(DCoreActor, time, spawnindex)
 
+DEFINE_ACTION_FUNCTION(DCoreActor, pos)
+{
+	PARAM_SELF_PROLOGUE(DCoreActor);
+	ACTION_RETURN_VEC3(DVector3(self->spr.pos.X * (1 / 16.), self->spr.pos.Y * (1 / 16.), self->spr.pos.Z * (1 / 256.)));
+}
+
+void coreactor_setpos(DCoreActor* self, double x, double y, double z, int relink)
+{
+	self->spr.pos.X = int(x * 16);
+	self->spr.pos.Y = int(y * 16);
+	self->spr.pos.Z = int(z * 256);
+	// todo: SW needs to call updatesectorz here or have a separate function.
+	if (relink) updatesector(self->spr.pos.X, self->spr.pos.Y, &self->spr.sectp);
+}
+
+DEFINE_ACTION_FUNCTION_NATIVE(DCoreActor, setpos, coreactor_setpos)
+{
+	PARAM_SELF_PROLOGUE(DCoreActor);
+	PARAM_FLOAT(x);
+	PARAM_FLOAT(y);
+	PARAM_FLOAT(z);
+	PARAM_BOOL(relink);
+	coreactor_setpos(self, x, y, z, relink);
+	return 0;
+}
+
+void coreactor_move(DCoreActor* self, double x, double y, double z, int relink)
+{
+	self->spr.pos.X += int(x * 16);
+	self->spr.pos.Y += int(y * 16);
+	self->spr.pos.Z += int(z * 256);
+	// todo: SW needs to call updatesectorz here or have a separate function.
+	if (relink) updatesector(self->spr.pos.X, self->spr.pos.Y, &self->spr.sectp);
+}
+
+DEFINE_ACTION_FUNCTION_NATIVE(DCoreActor, move, coreactor_move)
+{
+	PARAM_SELF_PROLOGUE(DCoreActor);
+	PARAM_FLOAT(x);
+	PARAM_FLOAT(y);
+	PARAM_FLOAT(z);
+	PARAM_BOOL(relink);
+	coreactor_move(self, x, y, z, relink);
+	return 0;
+}
+
+void coreactor_setz(DCoreActor* self, double z)
+{
+	self->spr.pos.Z = int(z * 256);
+}
+
+DEFINE_ACTION_FUNCTION_NATIVE(DCoreActor, setz, coreactor_setz)
+{
+	PARAM_SELF_PROLOGUE(DCoreActor);
+	PARAM_FLOAT(z);
+	self->spr.pos.Z = int(z * 256);
+	return 0;
+}
+
+void coreactor_addz(DCoreActor* self, double z)
+{
+	self->spr.pos.Z += int(z * 256);
+}
+
+DEFINE_ACTION_FUNCTION_NATIVE(DCoreActor, addz, coreactor_addz)
+{
+	PARAM_SELF_PROLOGUE(DCoreActor);
+	PARAM_FLOAT(z);
+	self->spr.pos.Z = int(z * 256);
+	return 0;
+}

wadsrc/static/zscript/coreactor.zs

@@ -29,10 +29,18 @@ class CoreActor native
 	native uint mdanimtims;
 	native int16 mdanimcur;
 	native int16 angoff, pitch, roll;
-	//native vec3 pivot_offset, position_offset;
+	//native vec3 pivot_offset, position_offset; // no access needed - these are display only.
 	native uint8 renderflags;
 	native float alpha;
 
 	native readonly int spawnindex;
+
+	// note that the pos vector is not directly accessible here.
+	// Its mixed fixed point format should be hidden from scripting, plus we need to wrap the setters to ensure proper sector linking anyway.
+	native Vector3 pos();
+	native void setpos(Vector3 newpos, bool relink = true);
+	native void move(Vector3 newpos, bool relink = true);
+	native void setz(double newz);
+	native void addz(double amount);
 }