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

LunaCON: add forgotted "screensound" to keyword list in con_lang.lua.

Browse source 
Also, fix 'spriteflags' directive.

git-svn-id: https://svn.eduke32.com/eduke32@3945 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-07-13 21:04:43 +00:00
parent b70779ba6f
commit e13cae69ce
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -948,6 +948,7 @@ enum ScriptKeywords_t
CON_SCREENSOUND, // 372 CON_SCREENSOUND, // 372
CON_END CON_END
}; };
// KEEPINSYNC with the keyword list in lunatic/con_lang.lua
#endif #endif

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

@ -945,6 +945,7 @@ lpeg.P(false) +
"sectclearinterpolation" + "sectclearinterpolation" +
"scriptsize" + "scriptsize" +
"screentext" + "screentext" +
"screensound" +
"savenn" + "savenn" +
"savemapstate" + "savemapstate" +
"savegamevar" + "savegamevar" +

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

@ -1124,7 +1124,7 @@ function Cmd.xspriteflags(tilenum, flags)
ffiC.g_tile[tilenum]._flags = flags ffiC.g_tile[tilenum]._flags = flags
else else
assert(type(flags)=="string") assert(type(flags)=="string")
ffiC.g_tile[tilenum]._flags = bit.bor(ffiC.g_tile[tilenum].flags, ffiC[flags]) ffiC.g_tile[tilenum]._flags = bit.bor(ffiC.g_tile[tilenum]._flags, ffiC[flags])
end end
end end
end end