zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

LunaCON: add 'definevolumeflags' to keyword pattern, re-apply some changes of r5026.

Browse source 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@5036 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-03-01 14:15:40 +00:00
parent 3ecc8a6962
commit 97c944a505
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1247,6 +1247,7 @@ lpeg.P(false) +
"digitalnumberz" + "digitalnumberz" +
"digitalnumber" + "digitalnumber" +
"definevolumename" + "definevolumename" +
"definevolumeflags" +
"definesound" + "definesound" +
"defineskillname" + "defineskillname" +
"definequote" + "definequote" +

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

@ -1383,7 +1383,7 @@ function Cmd.xspriteflags(tilenum, flags, override)
end end
-- Mark the last 'spriteflags' or 'sprite*' directive for the given actor. -- Mark the last 'spriteflags' or 'sprite*' directive for the given actor.
g_code.aflagsloc[tilenum] = getLocation(format("'%s' for actor", g_lastkw), pos) g_code.aflagsloc[tilenum] = getLocation(format("'%s' for actor", g_lastkw))
if (ffi and ok) then if (ffi and ok) then
local tile = ffiC.g_tile[tilenum] local tile = ffiC.g_tile[tilenum]
@ -2964,9 +2964,9 @@ local Cinner = {
/ "_con._starttrack(%1)", / "_con._starttrack(%1)",
starttrackvar = cmd(R) starttrackvar = cmd(R)
/ "_con._starttrack(%1)", / "_con._starttrack(%1)",
startcutscene = cmd(R) startcutscene = cmd(R)
/ handle.NYI, / handle.NYI,
getmusicposition = cmd(W) getmusicposition = cmd(W)
/ "%1=_con._getmusicposition()", / "%1=_con._getmusicposition()",
setmusicposition = cmd(R) setmusicposition = cmd(R)
@ -3906,7 +3906,7 @@ function parse(contents) -- local
end end
end end
function compare_gv(gva, gvb) local function compare_gv(gva, gvb)
if (gva.loc[1] ~= gvb.loc[1]) then if (gva.loc[1] ~= gvb.loc[1]) then
return gva.loc[1] < gvb.loc[1] return gva.loc[1] < gvb.loc[1]
end end