ProfessorFartsalot/SMScripts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ass_enhancer.inc

Browse Source
This commit is contained in:
Professor Fartsalot
2025-08-24 14:08:54 -04:00
parent aece767ef7
commit f8401bc955
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripting/include/fartsy/ass_enhancer.inc
View File

@@ -79,10 +79,6 @@ enum struct AUDIOMANAGER {
**/ **/
void ChangeBGM(int bgm, bool instant) { void ChangeBGM(int bgm, bool instant) {
this.indexBGM = this.VIPBGM > 0 ? this.VIPBGM : bgm == 0 ? g_indexBGM : bgm; this.indexBGM = this.VIPBGM > 0 ? this.VIPBGM : bgm == 0 ? g_indexBGM : bgm;
<<<<<<< Updated upstream
PrintToChatAll("%i = %i >=0 ? %i : %i == 0 ? %i : %i", this.indexBGM, this.VIPBGM, this.VIPBGM, bgm, g_indexBGM, bgm);
if (instant) { this.timeSeconds = GetEngineTime() - this.loopSeconds; }
=======
PrintToChatAll("%i = %i > 0 ? %i : %i == 0 ? %i : %i", this.indexBGM, this.VIPBGM, this.VIPBGM, bgm, g_indexBGM, bgm); PrintToChatAll("%i = %i > 0 ? %i : %i == 0 ? %i : %i", this.indexBGM, this.VIPBGM, this.VIPBGM, bgm, g_indexBGM, bgm);
PrintToServer("Set %i for %N", this.indexBGM, this.Client); PrintToServer("Set %i for %N", this.indexBGM, this.Client);
if (instant) { if (instant) {
@@ -90,7 +86,6 @@ enum struct AUDIOMANAGER {
CreateTimer(1.0, SyncMusic, this.Client); CreateTimer(1.0, SyncMusic, this.Client);
} }
PrintToServer("%f",GetEngineTime()); PrintToServer("%f",GetEngineTime());
>>>>>>> Stashed changes
this.shouldTick = true; this.shouldTick = true;
this.hasTimeOffset = BGMArray[this.indexBGM].introSeconds > 0 ? true : false; this.hasTimeOffset = BGMArray[this.indexBGM].introSeconds > 0 ? true : false;
this.stopBGM = !StrEqual(this.cachedPath, BGMArray[this.indexBGM].realPath) && !this.EventMode ? true : false; this.stopBGM = !StrEqual(this.cachedPath, BGMArray[this.indexBGM].realPath) && !this.EventMode ? true : false;