Moved AdjustTimePeriodByEngineTimerError() to _00E_TimeControl

4 months ago · 9272916e96
parent 35f8fb2e19
commit 9272916e96
10 changed files with 10 additions and 11 deletions
--- a/scripts/_00e_gaboff_grammophonesc.pex
+++ b/scripts/_00e_gaboff_grammophonesc.pex
--- a/scripts/_00e_mq13a_grammophonesc.pex
+++ b/scripts/_00e_mq13a_grammophonesc.pex
--- a/scripts/_00e_placeablegrammophonplay.pex
+++ b/scripts/_00e_placeablegrammophonplay.pex
--- a/scripts/_00e_questfunctions.pex
+++ b/scripts/_00e_questfunctions.pex
--- a/scripts/_00e_timecontrol.pex
+++ b/scripts/_00e_timecontrol.pex
--- a/source/scripts/_00e_gaboff_grammophonesc.psc
+++ b/source/scripts/_00e_gaboff_grammophonesc.psc
@ -24,7 +24,7 @@ Function PlayMusic(Sound musicSound, Float fMusicLength)
 	RegisterForModEvent("BardsLoadGame", "OnBardsLoadGame")
 	iSoundID = musicSound.Play(Self)
 	Sound.SetInstanceVolume(iSoundID, fVolume)
-	RegisterForSingleUpdate(_00E_QuestFunctions.AdjustTimePeriodByEngineTimerError(fMusicLength))
+	RegisterForSingleUpdate(_00E_TimeControl.AdjustTimePeriodByEngineTimerError(fMusicLength))
 	GoToState("")
 	_00E_PlayerhousingKoppophonVolume.Show(fVolume * 100.0)
 EndFunction
--- a/source/scripts/_00e_mq13a_grammophonesc.psc
+++ b/source/scripts/_00e_mq13a_grammophonesc.psc
@ -22,7 +22,7 @@ Function PlayMusic(Sound musicSound, Float fMusicLength)
 	RegisterForModEvent("BardsLoadGame", "OnBardsLoadGame")
 	iSoundID = musicSound.Play(Self)
 	Sound.SetInstanceVolume(iSoundID, fVolume)
-	RegisterForSingleUpdate(_00E_QuestFunctions.AdjustTimePeriodByEngineTimerError(fMusicLength))
+	RegisterForSingleUpdate(_00E_TimeControl.AdjustTimePeriodByEngineTimerError(fMusicLength))
 	GoToState("")
 	_00E_PlayerhousingKoppophonVolume.Show(fVolume * 100.0)
 EndFunction
--- a/source/scripts/_00e_placeablegrammophonplay.psc
+++ b/source/scripts/_00e_placeablegrammophonplay.psc
@ -80,7 +80,7 @@ Event OnActivate(ObjectReference triggerRef)
 				volume = 0.5
 			EndIf
 			Sound.SetInstanceVolume(playbackId, volume)
-			RegisterForSingleUpdate(_00E_QuestFunctions.AdjustTimePeriodByEngineTimerError(MUSIC_LENGTH))
+			RegisterForSingleUpdate(_00E_TimeControl.AdjustTimePeriodByEngineTimerError(MUSIC_LENGTH))

 			GoToState("")

--- a/source/scripts/_00e_questfunctions.psc
+++ b/source/scripts/_00e_questfunctions.psc
@ -163,14 +163,6 @@ Function WaitForReferenceToLoad(ObjectReference ref) Global

 EndFunction

-Float Function AdjustTimePeriodByEngineTimerError(Float fUnadjustedPeriod) Global
-
-	; In SE, the game time runs slower than the real time by about 2.5/60 second
-	
-	Return fUnadjustedPeriod - (2.5 * Math.Floor(fUnadjustedPeriod) / 60.0)
-
-EndFunction
-

 ;=====================================================================================
 ;              				GENERAL NON-GLOBAL FUNCTIONS                  			
--- a/source/scripts/_00e_timecontrol.psc
+++ b/source/scripts/_00e_timecontrol.psc
@ -57,3 +57,10 @@ Bool Function HourIsInRange(Float fHour, Float fHourStart, Float fHourEnd) Globa
 	EndIf

 EndFunction
+
+Float Function AdjustTimePeriodByEngineTimerError(Float fUnadjustedPeriod) Global
+
+	; In SE, the game time runs slower than the real time by about 2.5/60 second
+	Return fUnadjustedPeriod - (2.5 * Math.Floor(fUnadjustedPeriod) / 60.0)
+
+EndFunction