zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lunatic: rename spriteext[].*off->mdoff.*, actor[].actorstayput->stayputsect.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3874 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-06-12 17:49:55 +00:00
parent f6065e227a
commit 9911e96fe8
4 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
polymer/eduke32/source/lunatic/con_lang.lua
View file

@ -381,7 +381,7 @@ local ActorLabels = {
htowner = { AC".owner", AC":set_owner(%%s)" }, htowner = { AC".owner", AC":set_owner(%%s)" },
htmovflag = AC"._movflag", htmovflag = AC"._movflag",
httempang = AC".tempang", httempang = AC".tempang",
htactorstayput = AC".actorstayput", htactorstayput = AC".stayputsect", -- NAME
htdispicnum = { AC".dispicnum" }, htdispicnum = { AC".dispicnum" },
-- NOTE: no access for .shootzvel -- NOTE: no access for .shootzvel
httimetosleep = AC".timetosleep", httimetosleep = AC".timetosleep",
@ -396,13 +396,13 @@ local ActorLabels = {
htg_t = { AC":get_t_data(%s)", AC":_set_t_data(%s,%%s)" }, htg_t = { AC":get_t_data(%s)", AC":_set_t_data(%s,%%s)" },
htflags = AC".flags", htflags = AC".flags",
-- model flags -- (mostly) model-related flags
angoff = SX".angoff", angoff = SX".angoff",
pitch = SX".pitch", pitch = SX".pitch",
roll = SX".roll", roll = SX".roll",
mdxoff = SX".xoff", mdxoff = SX".mdoff.x", -- NAME
mdyoff = SX".yoff", mdyoff = SX".mdoff.y",
mdzoff = SX".zoff", mdzoff = SX".mdoff.z",
mdflags = SX".flags", mdflags = SX".flags",
xpanning = SX".xpanning", xpanning = SX".xpanning",
ypanning = SX".ypanning", ypanning = SX".ypanning",

2
polymer/eduke32/source/lunatic/defs.ilua
View file

@ -162,7 +162,7 @@ __attribute__((packed)) struct {
const int16_t owner; const int16_t owner;
int16_t _movflag,tempang,timetosleep; //6b int16_t _movflag,tempang,timetosleep; //6b
int16_t actorstayput; int16_t stayputsect;
const int16_t dispicnum; const int16_t dispicnum;
int16_t shootzvel, cgg; int16_t shootzvel, cgg;

11
polymer/eduke32/source/lunatic/defs_common.lua
View file

@ -205,12 +205,15 @@ typedef $ walltype;
typedef $ spritetype; typedef $ spritetype;
typedef struct { spritetype; } tspritetype; typedef struct { spritetype; } tspritetype;
typedef struct {
int32_t x, y, z;
} vec3_t;
typedef struct { typedef struct {
const uint32_t mdanimtims; const uint32_t mdanimtims;
const int16_t mdanimcur; const int16_t mdanimcur;
int16_t angoff, pitch, roll; int16_t angoff, pitch, roll;
// TODO: make into an ivec3_t vec3_t mdoff;
int32_t xoff, yoff, zoff;
]]..bitint_member("UBit8", "flags")..[[ ]]..bitint_member("UBit8", "flags")..[[
uint8_t xpanning, ypanning; uint8_t xpanning, ypanning;
const uint8_t filler; const uint8_t filler;
@ -221,10 +224,6 @@ typedef struct {
}; };
} spriteext_t; } spriteext_t;
typedef struct {
int32_t x, y, z;
} vec3_t;
typedef struct { typedef struct {
vec3_t pos; vec3_t pos;
int16_t sprite, wall, sect; int16_t sprite, wall, sect;

4
polymer/eduke32/source/lunatic/lunacon.lua
View file

@ -2188,7 +2188,7 @@ local Cinner = {
-- cont'd -- cont'd
addkills = cmd(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) addphealth = cmd(D)
/ format("_con._addphealth(%s,_aci,%%1)", PLS""), / format("_con._addphealth(%s,_aci,%%1)", PLS""),
debug = cmd(D) debug = cmd(D)
@ -2670,7 +2670,7 @@ local Cif = {
ifawayfromwall = cmd() ifawayfromwall = cmd()
/ format("_con._awayfromwall(%s,108)", SPS""), / format("_con._awayfromwall(%s,108)", SPS""),
ifactornotstayput = cmd() ifactornotstayput = cmd()
/ ACS".actorstayput==-1", / ACS".stayputsect==-1",
} }