From 9911e96fe8093416703c8e9f62c7e8030588ebf9 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 12 Jun 2013 17:49:55 +0000
Subject: [PATCH] Lunatic: rename spriteext[].*off->mdoff.*,
 actor[].actorstayput->stayputsect.

git-svn-id: https://svn.eduke32.com/eduke32@3874 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/lunatic/con_lang.lua    | 10 +++++-----
 polymer/eduke32/source/lunatic/defs.ilua       |  2 +-
 polymer/eduke32/source/lunatic/defs_common.lua | 11 +++++------
 polymer/eduke32/source/lunatic/lunacon.lua     |  4 ++--
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/polymer/eduke32/source/lunatic/con_lang.lua b/polymer/eduke32/source/lunatic/con_lang.lua
index a2359262b..618b974a8 100644
--- a/polymer/eduke32/source/lunatic/con_lang.lua
+++ b/polymer/eduke32/source/lunatic/con_lang.lua
@@ -381,7 +381,7 @@ local ActorLabels = {
     htowner = { AC".owner", AC":set_owner(%%s)" },
     htmovflag = AC"._movflag",
     httempang = AC".tempang",
-    htactorstayput = AC".actorstayput",
+    htactorstayput = AC".stayputsect",  -- NAME
     htdispicnum = { AC".dispicnum" },
     -- NOTE: no access for .shootzvel
     httimetosleep = AC".timetosleep",
@@ -396,13 +396,13 @@ local ActorLabels = {
     htg_t = { AC":get_t_data(%s)", AC":_set_t_data(%s,%%s)" },
     htflags = AC".flags",
 
-    -- model flags
+    -- (mostly) model-related flags
     angoff = SX".angoff",
     pitch = SX".pitch",
     roll = SX".roll",
-    mdxoff = SX".xoff",
-    mdyoff = SX".yoff",
-    mdzoff = SX".zoff",
+    mdxoff = SX".mdoff.x",  -- NAME
+    mdyoff = SX".mdoff.y",
+    mdzoff = SX".mdoff.z",
     mdflags = SX".flags",
     xpanning = SX".xpanning",
     ypanning = SX".ypanning",
diff --git a/polymer/eduke32/source/lunatic/defs.ilua b/polymer/eduke32/source/lunatic/defs.ilua
index 6672c6afe..b9d14474b 100644
--- a/polymer/eduke32/source/lunatic/defs.ilua
+++ b/polymer/eduke32/source/lunatic/defs.ilua
@@ -162,7 +162,7 @@ __attribute__((packed)) struct {
     const int16_t owner;
     int16_t _movflag,tempang,timetosleep; //6b
 
-    int16_t actorstayput;
+    int16_t stayputsect;
     const int16_t dispicnum;
     int16_t shootzvel, cgg;
 
diff --git a/polymer/eduke32/source/lunatic/defs_common.lua b/polymer/eduke32/source/lunatic/defs_common.lua
index c894d83ef..33e451b94 100644
--- a/polymer/eduke32/source/lunatic/defs_common.lua
+++ b/polymer/eduke32/source/lunatic/defs_common.lua
@@ -205,12 +205,15 @@ typedef $ walltype;
 typedef $ spritetype;
 typedef struct { spritetype; } tspritetype;
 
+typedef struct {
+    int32_t x, y, z;
+} vec3_t;
+
 typedef struct {
     const uint32_t mdanimtims;
     const int16_t mdanimcur;
     int16_t angoff, pitch, roll;
-    // TODO: make into an ivec3_t
-    int32_t xoff, yoff, zoff;
+    vec3_t mdoff;
 ]]..bitint_member("UBit8", "flags")..[[
     uint8_t xpanning, ypanning;
     const uint8_t filler;
@@ -221,10 +224,6 @@ typedef struct {
     };
 } spriteext_t;
 
-typedef struct {
-    int32_t x, y, z;
-} vec3_t;
-
 typedef struct {
     vec3_t pos;
     int16_t sprite, wall, sect;
diff --git a/polymer/eduke32/source/lunatic/lunacon.lua b/polymer/eduke32/source/lunatic/lunacon.lua
index 95262806a..e12ccd9bd 100644
--- a/polymer/eduke32/source/lunatic/lunacon.lua
+++ b/polymer/eduke32/source/lunatic/lunacon.lua
@@ -2188,7 +2188,7 @@ local Cinner = {
 
     -- cont'd
     addkills = cmd(D)
-        / (PLS".actors_killed="..PLS".actors_killed+%1;"..ACS".actorstayput=-1"),
+        / (PLS".actors_killed="..PLS".actors_killed+%1;"..ACS".stayputsect=-1"),
     addphealth = cmd(D)
         / format("_con._addphealth(%s,_aci,%%1)", PLS""),
     debug = cmd(D)
@@ -2670,7 +2670,7 @@ local Cif = {
     ifawayfromwall = cmd()
         / format("_con._awayfromwall(%s,108)", SPS""),
     ifactornotstayput = cmd()
-        / ACS".actorstayput==-1",
+        / ACS".stayputsect==-1",
 }