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

Lunatic: correct SFLAG_* and actor_t definitions.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3559 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-03-15 16:55:59 +00:00
parent f6d1af0532
commit 83bc10791f
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -201,16 +201,16 @@ local SFLAG = {
SFLAG_SHADOW = 0x00000001, SFLAG_SHADOW = 0x00000001,
SFLAG_NVG = 0x00000002, SFLAG_NVG = 0x00000002,
SFLAG_NOSHADE = 0x00000004, SFLAG_NOSHADE = 0x00000004,
SFLAG_PROJECTILE = 0x00000008, -- SFLAG_PROJECTILE = 0x00000008,
SFLAG_DECAL = 0x00000010, -- SFLAG_DECAL = 0x00000010,
SFLAG_BADGUY = 0x00000020, SFLAG_BADGUY = 0x00000020,
SFLAG_NOPAL = 0x00000040, SFLAG_NOPAL = 0x00000040,
SFLAG_NOEVENTCODE = 0x00000080, SFLAG_NOEVENTS = 0x00000080, -- NAME
SFLAG_NOLIGHT = 0x00000100, SFLAG_NOLIGHT = 0x00000100,
SFLAG_USEACTIVATOR = 0x00000200, SFLAG_USEACTIVATOR = 0x00000200,
SFLAG_NULL = 0x00000400, -- SFLAG_NULL = 0x00000400,
SFLAG_NOCLIP = 0x00000800, SFLAG_NOCLIP = 0x00000800,
SFLAG_NOFLOORSHADOW = 0x00001000, -- SFLAG_NOFLOORSHADOW = 0x00001000,
SFLAG_SMOOTHMOVE = 0x00002000, SFLAG_SMOOTHMOVE = 0x00002000,
SFLAG_NOTELEPORT = 0x00004000, SFLAG_NOTELEPORT = 0x00004000,
-- SFLAG_BADGUYSTAYPUT = 0x00008000, -- SFLAG_BADGUYSTAYPUT = 0x00008000,
@ -235,7 +235,7 @@ STAT = {
STAT_FALLER = 12, STAT_FALLER = 12,
STAT_DUMMYPLAYER = 13, STAT_DUMMYPLAYER = 13,
STAT_LIGHT = 14, STAT_LIGHT = 14,
-- STAT_NETALLOC = 15, -- STAT_NETALLOC = 1023, -- MAXSTATUS-1
} }
local GAMEFUNC = { local GAMEFUNC = {

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

@ -144,12 +144,12 @@ __attribute__((packed)) struct {
const int16_t owner; const int16_t owner;
int16_t movflag,tempang,timetosleep; //6b int16_t movflag,tempang,timetosleep; //6b
const int16_t lightId, lightcount, lightmaxrange;
int16_t cgg;
int16_t actorstayput; int16_t actorstayput;
const int16_t dispicnum; const int16_t dispicnum;
int16_t shootzvel; int16_t shootzvel, cgg;
const int8_t _do_not_use[8];
const int16_t lightId, lightcount, lightmaxrange;
const union { intptr_t ptr; uint64_t dummy; } _light;
} }
]] ]]

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

@ -2548,14 +2548,14 @@ local function all_alt_pattern(...)
end end
-- actor ORGANTIC is greeting! -- actor ORGANTIC is greeting!
local function warn_on_lonely_else(pos) function on.lonely_else(pos)
pwarnprintf(pos, "found `else' with no `if'") pwarnprintf(pos, "found `else' with no `if'")
end end
local con_inner_command = all_alt_pattern(Cinner) local con_inner_command = all_alt_pattern(Cinner)
local con_if_begs = all_alt_pattern(Cif) local con_if_begs = all_alt_pattern(Cif)
local lone_else = (POS() * "else" * sp1)/warn_on_lonely_else local lone_else = (POS() * "else" * sp1)/on.lonely_else
local stmt_list = Var("stmt_list") local stmt_list = Var("stmt_list")
-- possibly empty statement list: -- possibly empty statement list: