zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

gamedef.c: tweak g_keywdate[] entries.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5022 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-02-20 22:10:28 +00:00
parent 1bfdd54f81
commit 702f80cc17
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
polymer/eduke32/source/gamedef.c
View file

@ -95,9 +95,9 @@ static struct { uint32_t keyw; uint32_t date; } g_keywdate[] =
{ CON_SCREENTEXT, 20130529 }, { CON_SCREENTEXT, 20130529 },
{ CON_DYNAMICSOUNDREMAP, 20130530 }, { CON_DYNAMICSOUNDREMAP, 20130530 },
{ CON_SCREENSOUND, 20130628 }, { CON_SCREENSOUND, 20130628 },
{ CON_SETMUSICPOSITION, 20150115 }, { CON_SETMUSICPOSITION, 20150116 },
{ CON_CUTSCENE, 20150117 }, { CON_UNDEFINELEVEL, 20150208 },
{ CON_IFCUTSCENE, 20150117 }, { CON_IFCUTSCENE, 20150210 },
}; };
#endif #endif

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

@ -649,7 +649,7 @@ end
function on.event_end(pos, eventidx, codetab) function on.event_end(pos, eventidx, codetab)
assert(type(codetab)=="table") assert(type(codetab)=="table")
-- 0x20000000: actor.FLAGS.chain_beg -- 0x20000000: actor.FLAGS.chain_beg
paddcodef(pos, "gameevent{%d,0x20000000,function (_aci,_pli,_dist)", eventidx) paddcodef(pos, "gameevent{%d,0x20000000,function(_aci,_pli,_dist)", eventidx)
addcode(get_cache_sap_code()) addcode(get_cache_sap_code())
addcode(codetab) addcode(codetab)
addcode("end}") addcode("end}")
@ -663,7 +663,7 @@ function on.eventloadactor_end(pos, tilenum, codetab)
end end
-- Translate eventloadactor into a chained EVENT_LOADACTOR block -- Translate eventloadactor into a chained EVENT_LOADACTOR block
paddcodef(pos, "gameevent{'LOADACTOR', function (_aci,_pli,_dist)") paddcodef(pos, "gameevent{'LOADACTOR',function(_aci,_pli,_dist)")
addcode(get_cache_sap_code()) addcode(get_cache_sap_code())
addcodef("if (%s==%d) then", SPS".picnum", tilenum) addcodef("if (%s==%d) then", SPS".picnum", tilenum)
addcode(codetab) addcode(codetab)
@ -3086,13 +3086,13 @@ local Cif = {
ifactorsound = cmd(R,R) ifactorsound = cmd(R,R)
/ "_con._soundplaying(%1,%2)", / "_con._soundplaying(%1,%2)",
ifcutscene = cmd(R) ifcutscene = cmd(R)
/ function (cs) / function(cs)
handle.NYI() handle.NYI()
return "false" return "false"
end, end,
ifp = (sp1 * tok.define)^1 ifp = (sp1 * tok.define)^1
/ function (...) return format("_con._ifp(%d,_pli,_aci)", bit.bor(...)) end, / function(...) return format("_con._ifp(%d,_pli,_aci)", bit.bor(...)) end,
ifsquished = cmd() ifsquished = cmd()
/ "_con._squished(_aci,_pli)", / "_con._squished(_aci,_pli)",
ifserver = cmd() ifserver = cmd()