diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index 741343c7e..370f47180 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -557,7 +557,7 @@ const char *keyw[] = "undefinevolume", // 375 "undefineskill", // 376 "undefinelevel", // 377 - "cutscene", // 378 + "startcutscene", // 378 "ifcutscene", // 379 "" }; @@ -4168,7 +4168,7 @@ static int32_t C_ParseCommand(int32_t loop) case CON_SETACTORANGLE: case CON_SETPLAYERANGLE: case CON_SETMUSICPOSITION: - case CON_CUTSCENE: + case CON_STARTCUTSCENE: C_GetNextVar(); continue; diff --git a/polymer/eduke32/source/gamedef.h b/polymer/eduke32/source/gamedef.h index 18daac298..98854f71e 100644 --- a/polymer/eduke32/source/gamedef.h +++ b/polymer/eduke32/source/gamedef.h @@ -982,7 +982,7 @@ enum ScriptKeywords_t CON_UNDEFINEVOLUME, // 375 CON_UNDEFINESKILL, // 376 CON_UNDEFINELEVEL, // 377 - CON_CUTSCENE, // 378 + CON_STARTCUTSCENE, // 378 CON_IFCUTSCENE, // 379 CON_END }; diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c index 518fc7920..dcef5a5d1 100644 --- a/polymer/eduke32/source/gameexec.c +++ b/polymer/eduke32/source/gameexec.c @@ -2689,7 +2689,7 @@ nullquote: } continue; - case CON_CUTSCENE: + case CON_STARTCUTSCENE: case CON_IFCUTSCENE: insptr++; { diff --git a/polymer/eduke32/source/lunatic/con_lang.lua b/polymer/eduke32/source/lunatic/con_lang.lua index 6f3fc8580..7150471a2 100644 --- a/polymer/eduke32/source/lunatic/con_lang.lua +++ b/polymer/eduke32/source/lunatic/con_lang.lua @@ -957,6 +957,7 @@ lpeg.P(false) + "starttrackvar" + "starttrack" + "startlevel" + +"startcutscene" + "ssp" + "sqrt" + "spriteshadow" + @@ -1258,7 +1259,6 @@ lpeg.P(false) + "default" + "debug" + "debris" + ---"cutscene" + "cstator" + "cstat" + "count" + diff --git a/polymer/eduke32/source/lunatic/doc/lunacon.txt b/polymer/eduke32/source/lunatic/doc/lunacon.txt index a5e2261a9..6b7276dd4 100644 --- a/polymer/eduke32/source/lunatic/doc/lunacon.txt +++ b/polymer/eduke32/source/lunatic/doc/lunacon.txt @@ -354,7 +354,7 @@ Directives Run-time commands ^^^^^^^^^^^^^^^^^ -*`activatecheat`*, *`clearmapstate`*, *`cutscene`*, *`ifcutscene`*, `save`, +*`activatecheat`*, *`clearmapstate`*, *`startcutscene`*, *`ifcutscene`*, `save`, `savenn`, *`lineintersect`*, *`rayintersect`*, *`sectorofwall`*. Additionally, various multiplayer-related commands either unconditionally diff --git a/polymer/eduke32/source/lunatic/lunacon.lua b/polymer/eduke32/source/lunatic/lunacon.lua index 571a93d2d..dad25c4d2 100644 --- a/polymer/eduke32/source/lunatic/lunacon.lua +++ b/polymer/eduke32/source/lunatic/lunacon.lua @@ -1372,7 +1372,7 @@ function Cmd.xspriteflags(tilenum, flags, override) end -- Mark the last 'spriteflags' or 'sprite*' directive for the given actor. - g_code.aflagsloc[tilenum] = getLocation(format("'%s' for actor", g_lastkw)) + g_code.aflagsloc[tilenum] = getLocation(format("'%s' for actor", g_lastkw), pos) if (ffi and ok) then local tile = ffiC.g_tile[tilenum] @@ -2951,8 +2951,8 @@ local Cinner = { starttrackvar = cmd(R) / "_con._starttrack(%1)", --- cutscene = cmd(R) --- / handle.NYI, + startcutscene = cmd(R) + / handle.NYI, getmusicposition = cmd(W) / "%1=_con._getmusicposition()", setmusicposition = cmd(R) @@ -3892,7 +3892,7 @@ function parse(contents) -- local end end - local function compare_gv(gva, gvb) + function compare_gv(gva, gvb) if (gva.loc[1] ~= gvb.loc[1]) then return gva.loc[1] < gvb.loc[1] end