zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

CON: add getactor[]/sprite[] member 'movflags'.

Browse source 
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
This commit is contained in:
helixhorned 2014-04-19 22:42:18 +00:00
parent dccf7ebadc
commit fb05cf5b7e
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
polymer/eduke32/source/gamedef.c
View file

@ -827,6 +827,7 @@ const memberlabel_t ActorLabels[]=
{ "isvalid", ACTOR_ISVALID, 0, 0 }, { "isvalid", ACTOR_ISVALID, 0, 0 },
// aliases: // aliases:
{ "movflags", ACTOR_HITAG, 0, 0 },
{ "detail", ACTOR_DETAIL, 0, 0 }, // deprecated name for 'blend' { "detail", ACTOR_DETAIL, 0, 0 }, // deprecated name for 'blend'
{ "", -1, 0, 0 } // END OF LIST { "", -1, 0, 0 } // END OF LIST

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

@ -416,6 +416,7 @@ local ActorLabels = {
-- Read access differs from write ({ get, set }): -- Read access differs from write ({ get, set }):
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",
movflags = AC".movflags",
-- (mostly) model-related flags -- (mostly) model-related flags
angoff = SX".angoff", angoff = SX".angoff",

2
polymer/eduke32/source/lunatic/doc/lunatic.txt
View file

@ -1232,7 +1232,7 @@ goggles activated, respectively.
_`weapondata_t`_ +weapon[_weapon_]+:: _`weapondata_t`_ +weapon[_weapon_]+::
A struct containing information about the behavior each of weapon for this 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 `*`. {wiki_predef_gamevars}[`WEAPONx_*`] for weapon indices `x` and members `*`.
[float] [float]

7
polymer/eduke32/source/lunatic/test/shadexfog.lua
View file

@ -267,7 +267,9 @@ local function create_base_shtab_2(basesht)
return sht:remap16(iperm16) return sht:remap16(iperm16)
end 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. -- Wrapper around engine.savePaletteDat() that errors on unexpected events.
function shadexfog.save(filename, palnum, blendnum, moreblends, lognumalphatabs) function shadexfog.save(filename, palnum, blendnum, moreblends, lognumalphatabs)
local ok, errmsg, nummoreblends = engine.savePaletteDat( local ok, errmsg, nummoreblends = engine.savePaletteDat(
@ -409,6 +411,9 @@ function shadexfog.create_additive_trans(startblendidx, numtables, fullbrightsOK
) )
end end
if (not ismapster32) then
return shadexfog
end
--========== Mapster32 Lua menu hooks ==========-- --========== Mapster32 Lua menu hooks ==========--