zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

CON: Add "stopallmusic" command.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6427 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-08-06 13:45:02 +00:00
parent c750f8262a
commit df70cbbbeb
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -600,6 +600,7 @@ const char *keyw[] = {
"drawline256", // 404 "drawline256", // 404
"drawlinergb", // 405 "drawlinergb", // 405
"starttrackslot", // 406 "starttrackslot", // 406
"stopallmusic", // 407
NULL NULL
}; };
#endif #endif
@ -6038,6 +6039,7 @@ repeatcase:
case CON_GETTEXTURECEILING: case CON_GETTEXTURECEILING:
case CON_INSERTSPRITEQ: case CON_INSERTSPRITEQ:
case CON_STOPALLSOUNDS: case CON_STOPALLSOUNDS:
case CON_STOPALLMUSIC:
continue; continue;
case CON_NULLOP: case CON_NULLOP:

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

@ -1142,6 +1142,7 @@ enum ScriptKeywords_t
CON_DRAWLINE256, // 404 CON_DRAWLINE256, // 404
CON_DRAWLINERGB, // 405 CON_DRAWLINERGB, // 405
CON_STARTTRACKSLOT, // 406 CON_STARTTRACKSLOT, // 406
CON_STOPALLMUSIC, // 407
CON_END CON_END
}; };
// KEEPINSYNC with the keyword list in lunatic/con_lang.lua // KEEPINSYNC with the keyword list in lunatic/con_lang.lua

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

@ -3605,6 +3605,11 @@ nullquote:
FX_StopAllSounds(); FX_StopAllSounds();
continue; continue;
case CON_STOPALLMUSIC:
insptr++;
S_StopMusic();
continue;
case CON_IFGAPZL: case CON_IFGAPZL:
insptr++; insptr++;
VM_CONDITIONAL(((vm.pActor->floorz - vm.pActor->ceilingz) >> 8) < *insptr); VM_CONDITIONAL(((vm.pActor->floorz - vm.pActor->ceilingz) >> 8) < *insptr);