From f8401bc9551b7c9eafec32e6081041efe47d6e3c Mon Sep 17 00:00:00 2001 From: Professor Fartsalot Date: Sun, 24 Aug 2025 14:08:54 -0400 Subject: [PATCH] Update ass_enhancer.inc --- scripting/include/fartsy/ass_enhancer.inc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripting/include/fartsy/ass_enhancer.inc b/scripting/include/fartsy/ass_enhancer.inc index fe24657..11337f1 100644 --- a/scripting/include/fartsy/ass_enhancer.inc +++ b/scripting/include/fartsy/ass_enhancer.inc @@ -79,10 +79,6 @@ enum struct AUDIOMANAGER { **/ void ChangeBGM(int bgm, bool instant) { 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); PrintToServer("Set %i for %N", this.indexBGM, this.Client); if (instant) { @@ -90,7 +86,6 @@ enum struct AUDIOMANAGER { CreateTimer(1.0, SyncMusic, this.Client); } PrintToServer("%f",GetEngineTime()); ->>>>>>> Stashed changes this.shouldTick = true; this.hasTimeOffset = BGMArray[this.indexBGM].introSeconds > 0 ? true : false; this.stopBGM = !StrEqual(this.cachedPath, BGMArray[this.indexBGM].realPath) && !this.EventMode ? true : false;