incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update ACS music change commands to modify mapmusname to keep music persistant

Browse source
This commit is contained in:
NepDisk 2025-10-22 14:28:22 -04:00
parent f5657d9e81
commit 64c74cd661
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/acs/call-funcs.cpp
View file

@ -3188,9 +3188,17 @@ bool CallFunc_MusicPlay(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::W
{
return false;
}
S_ChangeMusicEx(map->getString(argV[0])->str, 0, true, mapmusposition, 0, 0);
boolean musicsame = !strnicmp(map->getString(argV[0])->str, mapmusname, 7);
if (!musicsame)
{
S_ChangeMusicEx(map->getString(argV[0])->str, 0, true, mapmusposition, 0, 0);
strncpy(mapmusname, S_MusicName(), 7);
mapmusname[6] = 0;
}
return false;
}
@ -3231,8 +3239,16 @@ bool CallFunc_MusicRemap(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::
{
return false;
}
S_ChangeMusicEx(map->getString(argV[0])->str, 0, true, lastmapmusposition, 0, 0);
boolean musicsame = !strnicmp(map->getString(argV[0])->str, mapmusname, 7);
if (!musicsame)
{
S_ChangeMusicEx(map->getString(argV[0])->str, 0, true, lastmapmusposition, 0, 0);
strncpy(mapmusname, S_MusicName(), 7);
mapmusname[6] = 0;
}
return false;
}