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

LunaCON: partially sync with r3803, link with lpeg.a (update to LPeg 0.12).

Browse source 
For pre-1.3 CONs, determining the older script version with gamestartup and/or
definelevelname is not implemented.

git-svn-id: https://svn.eduke32.com/eduke32@3806 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-05-24 13:54:29 +00:00
parent 8d74181ddf
commit 4781eecdb4
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/Makefile
View file

@ -147,7 +147,7 @@ ifneq (0,$(LUNATIC))
EDITOROBJS+= $(OBJ)/lunatic_m32.$o $(LUNATIC_COMMON_OBJS) EDITOROBJS+= $(OBJ)/lunatic_m32.$o $(LUNATIC_COMMON_OBJS)
GAMEOBJS+= $(OBJ)/lunatic_game.$o $(LUNATIC_COMMON_OBJS) GAMEOBJS+= $(OBJ)/lunatic_game.$o $(LUNATIC_COMMON_OBJS)
GAMEOBJS+= $(OBJ)/../lpeg.$o # TEMP GAMEOBJS+= $(OBJ)/../lpeg.a # TEMP
GAMEOBJS+= $(OBJ)/luaJIT_BC_con_lang.$o \ GAMEOBJS+= $(OBJ)/luaJIT_BC_con_lang.$o \
$(OBJ)/luaJIT_BC_lunacon.$o \ $(OBJ)/luaJIT_BC_lunacon.$o \
$(OBJ)/luaJIT_BC_geom.$o \ $(OBJ)/luaJIT_BC_geom.$o \

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

@ -867,6 +867,7 @@ local function reset_gamedata()
g_data.music = {} g_data.music = {}
end end
-- TODO: PRE13 has no <dtstr> (3D Realms time).
function Cmd.definelevelname(vol, lev, fn, ptstr, dtstr, levname) function Cmd.definelevelname(vol, lev, fn, ptstr, dtstr, levname)
if (not (vol >= 0 and vol < conl.MAXVOLUMES)) then if (not (vol >= 0 and vol < conl.MAXVOLUMES)) then
errprintf("volume number exceeds maximum volume count.") errprintf("volume number exceeds maximum volume count.")
@ -1013,6 +1014,7 @@ end
function Cmd.gamestartup(...) function Cmd.gamestartup(...)
local args = {...} local args = {...}
-- TODO: PRE13: detection of other g_scriptVersion.
if (#args ~= 26 and #args ~= 30) then if (#args ~= 26 and #args ~= 30) then
errprintf("must pass either 26 (1.3D) or 30 (1.5) values") errprintf("must pass either 26 (1.3D) or 30 (1.5) values")
return return
@ -1934,6 +1936,8 @@ local Cinner = {
/ SPS".cstat=%1", / SPS".cstat=%1",
clipdist = cmd(D) clipdist = cmd(D)
/ SPS".clipdist=%1", / SPS".clipdist=%1",
shadeto = cmd(D) / -- PRE13
"",
sizeto = cmd(D,D) sizeto = cmd(D,D)
/ "_con._sizeto(_aci,%1,%2)", -- TODO: see control.lua:_sizeto / "_con._sizeto(_aci,%1,%2)", -- TODO: see control.lua:_sizeto
sizeat = cmd(D,D) sizeat = cmd(D,D)
@ -2053,6 +2057,8 @@ local Cinner = {
/ handle.debug, / handle.debug,
endofgame = cmd(D) endofgame = cmd(D)
/ "_con._endofgame(_pli,%1)", / "_con._endofgame(_pli,%1)",
endoflevel = cmd(D) -- PRE13
/ "_con._endofgame(_pli,%1)",
lotsofglass = cmd(D) lotsofglass = cmd(D)
/ "_con._A_SpawnGlass(_aci,%1)", / "_con._A_SpawnGlass(_aci,%1)",
mail = cmd(D) mail = cmd(D)
@ -2269,6 +2275,8 @@ local Cinner = {
activatebysector = cmd(R,R) activatebysector = cmd(R,R)
/ "_con._activatebysector(%1,%2)", / "_con._activatebysector(%1,%2)",
activate = cmd(D) -- PRE13, THISACTOR already translated to cur. player
/ "_con._operateactivators(%d,_pli)",
operateactivators = cmd(R,R) -- THISACTOR operateactivators = cmd(R,R) -- THISACTOR
/ function(tag, pli) / function(tag, pli)
return format("_con._operateactivators(%s,%s)", tag, thisactor_to_pli(pli)) return format("_con._operateactivators(%s,%s)", tag, thisactor_to_pli(pli))
@ -2418,6 +2426,8 @@ local Cif = {
/ format("(%s-%s)<=256*%%1", SPS".z", ACS".ceilingz"), / format("(%s-%s)<=256*%%1", SPS".z", ACS".ceilingz"),
ifphealthl = cmd(D) ifphealthl = cmd(D)
/ format("sprite[%s].extra<%%1", PLS".i"), / format("sprite[%s].extra<%%1", PLS".i"),
ifplayersl = cmd(D) -- PRE13
/ "1<%1", -- TODO_MP
ifspritepal = cmd(D) ifspritepal = cmd(D)
/ SPS".pal==%1", / SPS".pal==%1",
ifgotweaponce = cmd(D) ifgotweaponce = cmd(D)