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

LunaCON: allow a certain type error present in 1.3D GAME.CON to pass.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4025 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-08-19 19:26:58 +00:00
parent b1b043bfc7
commit e53c50e6aa
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -880,14 +880,20 @@ function lookup.composite(labeltype, pos, identifier)
end end
local val = g_labeldef[identifier] local val = g_labeldef[identifier]
local typ = g_labeltype[identifier]
if (val == nil) then if (val == nil) then
perrprintf(pos, "label \"%s\" is not defined", identifier) perrprintf(pos, "label \"%s\" is not defined", identifier)
return "_NOTDEF" return "_NOTDEF"
elseif (g_labeltype[identifier] ~= labeltype) then elseif (typ ~= labeltype) then
if (identifier=="randomangle" and labeltype==LABEL.MOVE) then if (identifier=="randomangle" and labeltype==LABEL.MOVE and typ==LABEL.NUMBER) then
-- Be forgiving with a 1.3/1.5 GAME.CON type error.
pwarnprintf(pos, "label \"randomangle\" is not a `move' value, assuming 0") pwarnprintf(pos, "label \"randomangle\" is not a `move' value, assuming 0")
return "0" return "0"
elseif (identifier=="BLIMPRESPAWNTIME" and labeltype==LABEL.ACTION and typ==LABEL.NUMBER) then
-- Be forgiving with a 1.3 GAME.CON type error.
pwarnprintf(pos, "label \"BLIMPRESPAWNTIME\" is not an `action' value, assuming 0")
return "0"
else else
perrprintf(pos, "label \"%s\" is not a%s `%s' value", identifier, perrprintf(pos, "label \"%s\" is not a%s `%s' value", identifier,
labeltype==LABEL.MOVE and "" or "n", LABEL[labeltype]) labeltype==LABEL.MOVE and "" or "n", LABEL[labeltype])