zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 22:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

CON: Add spawnceilingglass, spawnwallglass, and spawnwallstainedglass commands.

Browse source 
Patch from Striker.

git-svn-id: https://svn.eduke32.com/eduke32@6824 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2018-04-11 03:33:59 +00:00
parent d41f233045
commit 6eeb14a12f
3 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/duke3d/src/gamedef.cpp
View file

@ -470,6 +470,9 @@ static tokenmap_t const vm_keywords[] =
{ "soundoncevar", CON_SOUNDONCEVAR }, { "soundoncevar", CON_SOUNDONCEVAR },
{ "soundvar", CON_SOUNDVAR }, { "soundvar", CON_SOUNDVAR },
{ "spawn", CON_SPAWN }, { "spawn", CON_SPAWN },
{ "spawnceilingglass", CON_SPAWNCEILINGGLASS },
{ "spawnwallstainedglass", CON_SPAWNWALLSTAINEDGLASS },
{ "spawnwallglass", CON_SPAWNWALLGLASS },
{ "spgethitag", CON_SPGETHITAG }, { "spgethitag", CON_SPGETHITAG },
{ "spgetlotag", CON_SPGETLOTAG }, { "spgetlotag", CON_SPGETLOTAG },
{ "spriteflags", CON_SPRITEFLAGS }, { "spriteflags", CON_SPRITEFLAGS },
@ -4257,6 +4260,9 @@ DO_DEFSTATE:
case CON_STARTTRACKSLOT: case CON_STARTTRACKSLOT:
case CON_SWAPTRACKSLOT: case CON_SWAPTRACKSLOT:
case CON_PRELOADTRACKSLOTFORSWAP: case CON_PRELOADTRACKSLOTFORSWAP:
case CON_SPAWNWALLGLASS:
case CON_SPAWNWALLSTAINEDGLASS:
case CON_SPAWNCEILINGGLASS:
C_GetManyVars(2); C_GetManyVars(2);
continue; continue;

3
source/duke3d/src/gamedef.h
View file

@ -1249,6 +1249,9 @@ enum ScriptKeywords_t
CON_SETTILEDATA, // 428 CON_SETTILEDATA, // 428
CON_DAMAGEEVENTTILE, // 429 CON_DAMAGEEVENTTILE, // 429
CON_DAMAGEEVENTTILERANGE, // 430 CON_DAMAGEEVENTTILERANGE, // 430
CON_SPAWNWALLGLASS, // 431
CON_SPAWNWALLSTAINEDGLASS, // 432
CON_SPAWNCEILINGGLASS, // 433
CON_END CON_END
}; };
// KEEPINSYNC with the keyword list in lunatic/con_lang.lua // KEEPINSYNC with the keyword list in lunatic/con_lang.lua

27
source/duke3d/src/gameexec.cpp
View file

@ -1847,6 +1847,33 @@ skip_check:
A_SpawnGlass(vm.spriteNum,*insptr++); A_SpawnGlass(vm.spriteNum,*insptr++);
continue; continue;
case CON_SPAWNWALLGLASS:
insptr++;
{
int const wallNum = Gv_GetVarX(*insptr++);
int const numShards = Gv_GetVarX(*insptr++);
A_SpawnWallGlass(vm.spriteNum, wallNum, numShards);
}
continue;
case CON_SPAWNWALLSTAINEDGLASS:
insptr++;
{
int const wallNum = Gv_GetVarX(*insptr++);
int const numShards = Gv_GetVarX(*insptr++);
A_SpawnRandomGlass(vm.spriteNum, wallNum, numShards);
}
continue;
case CON_SPAWNCEILINGGLASS:
insptr++;
{
int const sectNum = Gv_GetVarX(*insptr++);
int const numShards = Gv_GetVarX(*insptr++);
A_SpawnCeilingGlass(vm.spriteNum, sectNum, numShards);
}
continue;
case CON_KILLIT: case CON_KILLIT:
insptr++; insptr++;
vm.flags |= VM_KILL; vm.flags |= VM_KILL;