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

LunaCON: ignore internal flag in gamevar redef check; allow "Pals" member.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4581 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-08-31 11:15:20 +00:00
parent 96b3408dbd
commit fea848c486
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1513,7 +1513,8 @@ function Cmd.gamevar(identifier, initval, flags)
end end
if (ogv ~= nil) then if (ogv ~= nil) then
local oflags = ogv.flags local oflags = bit.band(ogv.flags, bit.bnot(GVFLAG.CON_PERPLAYER))
if (oflags ~= flags) then if (oflags ~= flags) then
if (bit.band(oflags, GVFLAG.SYSTEM) ~= 0 and not isSessionVar) then if (bit.band(oflags, GVFLAG.SYSTEM) ~= 0 and not isSessionVar) then
-- Attempt to override a system gamevar. See if it's read-only... -- Attempt to override a system gamevar. See if it's read-only...
@ -1549,7 +1550,7 @@ function Cmd.gamevar(identifier, initval, flags)
return return
end end
errprintf("duplicate definition of gamevar `%s' has different flags", identifier) errprintf("duplicate definition of gamevar `%s' has different flags (new: %x, old: %x)", identifier, flags, oflags)
inform.oldgv_location(identifier, true) inform.oldgv_location(identifier, true)
return return
else else
@ -1908,7 +1909,10 @@ local patt = {}
-- will be wrongly accepted at the parsing stage (loogiex is player's member) -- will be wrongly accepted at the parsing stage (loogiex is player's member)
-- because we don't discriminate between actor and player here. -- because we don't discriminate between actor and player here.
patt.parm2member = lpeg.C(Pat("htg_t") + "loogiex" + "loogiey" + "ammo_amount" + patt.parm2member = lpeg.C(Pat("htg_t") + "loogiex" + "loogiey" + "ammo_amount" +
"weaprecs" + "gotweapon" + "pals" + "max_ammo_amount") * sp1 * tok.rvar "weaprecs" + "gotweapon" + "pals" + "Pals" + "max_ammo_amount") * sp1 * tok.rvar
-- XXX: "pals" + "Pals": this sucks! It means that we for this list of members
-- requiring second parameters, we will have to enumerate all lower/uppercase
-- instances encountered in the wild.
-- The member name must match keywords, too (_all), because e.g. cstat is a -- The member name must match keywords, too (_all), because e.g. cstat is a
-- member of sprite[]. -- member of sprite[].