Merge pull request #2135 from momoko-h/RemoveUselessVariable [skip ci]

Remove gfForceMusicToTense
ja2-stracciatella · Dec 16, 2024 · 2e6f064 · 2e6f064
2 parents df32818 + c7c9ad0
commit 2e6f064
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 5 deletions.
diff --git a/src/game/Tactical/Overhead.cc b/src/game/Tactical/Overhead.cc
@@ -4036,8 +4036,6 @@ void ExitCombatMode( )
 	}
 
 	// Change music modes
-	gfForceMusicToTense = TRUE;
-
 	SetMusicMode( MUSIC_TACTICAL_ENEMYPRESENT );
 
 	BetweenTurnsVisibilityAdjustments();
@@ -4327,7 +4325,6 @@ BOOLEAN CheckForEndOfCombatMode( BOOLEAN fIncrementTurnsNotSeen )
 		}*/
 
 		// Begin tense music....
-		gfForceMusicToTense = TRUE;
 		SetMusicMode( MUSIC_TACTICAL_ENEMYPRESENT );
 
 		return( TRUE );

diff --git a/src/game/Utils/Music_Control.cc b/src/game/Utils/Music_Control.cc
@@ -29,7 +29,6 @@ static INT8 gbDeathSongCount   = 0;
 static INT8 gbFadeSpeed = 1;
 
 
-BOOLEAN        gfForceMusicToTense = FALSE;
 static BOOLEAN gfDontRestartSong   = FALSE;
 
 

diff --git a/src/game/Utils/Music_Control.h b/src/game/Utils/Music_Control.h
@@ -6,7 +6,6 @@
 #include <string_theory/string>
 
 extern MusicMode gubMusicMode;
-extern BOOLEAN	gfForceMusicToTense;
 
 
 void SetMusicMode(MusicMode ubMusicMode);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,7 +29,6 @@ static INT8 gbDeathSongCount = 0;
		static INT8 gbFadeSpeed = 1;


		BOOLEAN gfForceMusicToTense = FALSE;
		static BOOLEAN gfDontRestartSong = FALSE;


Expand Down