From fb05cf5b7efeff9d75d752955b5f76c5b2407634 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sat, 19 Apr 2014 22:42:18 +0000 Subject: [PATCH] CON: add getactor[]/sprite[] member 'movflags'. This is exactly the same as the actor[].movflags member in the Lunatic build: http://lunatic.eduke32.com/lunatic.html#actor git-svn-id: https://svn.eduke32.com/eduke32@4448 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/gamedef.c | 1 + polymer/eduke32/source/lunatic/con_lang.lua | 1 + polymer/eduke32/source/lunatic/doc/lunatic.txt | 2 +- polymer/eduke32/source/lunatic/test/shadexfog.lua | 7 ++++++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index d2d0541d1..f6cafa372 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -827,6 +827,7 @@ const memberlabel_t ActorLabels[]= { "isvalid", ACTOR_ISVALID, 0, 0 }, // aliases: + { "movflags", ACTOR_HITAG, 0, 0 }, { "detail", ACTOR_DETAIL, 0, 0 }, // deprecated name for 'blend' { "", -1, 0, 0 } // END OF LIST diff --git a/polymer/eduke32/source/lunatic/con_lang.lua b/polymer/eduke32/source/lunatic/con_lang.lua index 9c7a6b8ca..5b3fa28f8 100644 --- a/polymer/eduke32/source/lunatic/con_lang.lua +++ b/polymer/eduke32/source/lunatic/con_lang.lua @@ -416,6 +416,7 @@ local ActorLabels = { -- Read access differs from write ({ get, set }): htg_t = { AC":_get_t_data(%s)", AC":_set_t_data(%s,%%s)" }, htflags = AC".flags", + movflags = AC".movflags", -- (mostly) model-related flags angoff = SX".angoff", diff --git a/polymer/eduke32/source/lunatic/doc/lunatic.txt b/polymer/eduke32/source/lunatic/doc/lunatic.txt index 5f2071135..f7bfd44d0 100644 --- a/polymer/eduke32/source/lunatic/doc/lunatic.txt +++ b/polymer/eduke32/source/lunatic/doc/lunatic.txt @@ -1232,7 +1232,7 @@ goggles activated, respectively. _`weapondata_t`_ +weapon[_weapon_]+:: A struct containing information about the behavior each of weapon for this -player. In CON, these are available under the name +player. In CON, these are available as separate gamevars named {wiki_predef_gamevars}[`WEAPONx_*`] for weapon indices `x` and members `*`. [float] diff --git a/polymer/eduke32/source/lunatic/test/shadexfog.lua b/polymer/eduke32/source/lunatic/test/shadexfog.lua index f4aa53779..26dfe410d 100644 --- a/polymer/eduke32/source/lunatic/test/shadexfog.lua +++ b/polymer/eduke32/source/lunatic/test/shadexfog.lua @@ -267,7 +267,9 @@ local function create_base_shtab_2(basesht) return sht:remap16(iperm16) end -if (gv.LUNATIC_CLIENT == gv.LUNATIC_CLIENT_MAPSTER32) then +local ismapster32 = (gv.LUNATIC_CLIENT == gv.LUNATIC_CLIENT_MAPSTER32) + +if (ismapster32) then -- Wrapper around engine.savePaletteDat() that errors on unexpected events. function shadexfog.save(filename, palnum, blendnum, moreblends, lognumalphatabs) local ok, errmsg, nummoreblends = engine.savePaletteDat( @@ -409,6 +411,9 @@ function shadexfog.create_additive_trans(startblendidx, numtables, fullbrightsOK ) end +if (not ismapster32) then + return shadexfog +end --========== Mapster32 Lua menu hooks ==========--