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

CON: Rename "cutscene" command to "startcutscene".

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5031 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-02-22 22:14:39 +00:00
parent 7285bc3bb2
commit 31c9d21b06
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -557,7 +557,7 @@ const char *keyw[] =
"undefinevolume", // 375 "undefinevolume", // 375
"undefineskill", // 376 "undefineskill", // 376
"undefinelevel", // 377 "undefinelevel", // 377
"cutscene", // 378 "startcutscene", // 378
"ifcutscene", // 379 "ifcutscene", // 379
"<null>" "<null>"
}; };
@ -4168,7 +4168,7 @@ static int32_t C_ParseCommand(int32_t loop)
case CON_SETACTORANGLE: case CON_SETACTORANGLE:
case CON_SETPLAYERANGLE: case CON_SETPLAYERANGLE:
case CON_SETMUSICPOSITION: case CON_SETMUSICPOSITION:
case CON_CUTSCENE: case CON_STARTCUTSCENE:
C_GetNextVar(); C_GetNextVar();
continue; continue;

2
polymer/eduke32/source/gamedef.h
View file

@ -982,7 +982,7 @@ enum ScriptKeywords_t
CON_UNDEFINEVOLUME, // 375 CON_UNDEFINEVOLUME, // 375
CON_UNDEFINESKILL, // 376 CON_UNDEFINESKILL, // 376
CON_UNDEFINELEVEL, // 377 CON_UNDEFINELEVEL, // 377
CON_CUTSCENE, // 378 CON_STARTCUTSCENE, // 378
CON_IFCUTSCENE, // 379 CON_IFCUTSCENE, // 379
CON_END CON_END
}; };

2
polymer/eduke32/source/gameexec.c
View file

@ -2689,7 +2689,7 @@ nullquote:
} }
continue; continue;
case CON_CUTSCENE: case CON_STARTCUTSCENE:
case CON_IFCUTSCENE: case CON_IFCUTSCENE:
insptr++; insptr++;
{ {

2
polymer/eduke32/source/lunatic/con_lang.lua
View file

@ -957,6 +957,7 @@ lpeg.P(false) +
"starttrackvar" + "starttrackvar" +
"starttrack" + "starttrack" +
"startlevel" + "startlevel" +
"startcutscene" +
"ssp" + "ssp" +
"sqrt" + "sqrt" +
"spriteshadow" + "spriteshadow" +
@ -1258,7 +1259,6 @@ lpeg.P(false) +
"default" + "default" +
"debug" + "debug" +
"debris" + "debris" +
--"cutscene" +
"cstator" + "cstator" +
"cstat" + "cstat" +
"count" + "count" +

2
polymer/eduke32/source/lunatic/doc/lunacon.txt
View file

@ -354,7 +354,7 @@ Directives
Run-time commands Run-time commands
^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^
*`activatecheat`*, *`clearmapstate`*, *`cutscene`*, *`ifcutscene`*, `save`, *`activatecheat`*, *`clearmapstate`*, *`startcutscene`*, *`ifcutscene`*, `save`,
`savenn`, *`lineintersect`*, *`rayintersect`*, *`sectorofwall`*. `savenn`, *`lineintersect`*, *`rayintersect`*, *`sectorofwall`*.
Additionally, various multiplayer-related commands either unconditionally Additionally, various multiplayer-related commands either unconditionally

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

@ -1372,7 +1372,7 @@ function Cmd.xspriteflags(tilenum, flags, override)
end end
-- Mark the last 'spriteflags' or 'sprite*' directive for the given actor. -- 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 if (ffi and ok) then
local tile = ffiC.g_tile[tilenum] local tile = ffiC.g_tile[tilenum]
@ -2951,8 +2951,8 @@ local Cinner = {
starttrackvar = cmd(R) starttrackvar = cmd(R)
/ "_con._starttrack(%1)", / "_con._starttrack(%1)",
-- cutscene = cmd(R) startcutscene = cmd(R)
-- / handle.NYI, / handle.NYI,
getmusicposition = cmd(W) getmusicposition = cmd(W)
/ "%1=_con._getmusicposition()", / "%1=_con._getmusicposition()",
setmusicposition = cmd(R) setmusicposition = cmd(R)
@ -3892,7 +3892,7 @@ function parse(contents) -- local
end end
end end
local function compare_gv(gva, gvb) function compare_gv(gva, gvb)
if (gva.loc[1] ~= gvb.loc[1]) then if (gva.loc[1] ~= gvb.loc[1]) then
return gva.loc[1] < gvb.loc[1] return gva.loc[1] < gvb.loc[1]
end end