actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Prevent possible crash noticed during testing.

Browse Source
This commit is contained in:
Jason Felds
2013-07-04 22:54:38 -04:00
parent 162b626e3e
commit 0259af5c80
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Player.cpp
+11 -6
View File
@@ -1443,15 +1443,20 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
tn.HoldResult.fLife = fLife; tn.HoldResult.fLife = fLife;
tn.HoldResult.hns = hns; tn.HoldResult.hns = hns;
// Stop the playing keysound for the hold note. // Stop the playing keysound for the hold note.
// I think this causes crashes too. -aj (Possibly fixed. -?) // I think this causes crashes too. -aj
// This can still crash. I think it expects a full game and quit before the preference works:
// otherwise, it causes problems on holds. At least, that hapened on my Mac. -wolfman2000
Preference<float> *pVolume = Preference<float>::GetPreferenceByName("SoundVolume"); Preference<float> *pVolume = Preference<float>::GetPreferenceByName("SoundVolume");
float fVol = pVolume->Get(); if (pVolume != NULL)
if( tn.iKeysoundIndex >= 0 && tn.iKeysoundIndex < (int) m_vKeysounds.size() )
{ {
float factor = (tn.subType == TapNote::hold_head_roll ? 2.0f * fLifeFraction : 10.0f * fLifeFraction - 8.5f); float fVol = pVolume->Get();
m_vKeysounds[tn.iKeysoundIndex].SetProperty ("Volume", max(0.0f, min(1.0f, factor)) * fVol);
if( tn.iKeysoundIndex >= 0 && tn.iKeysoundIndex < (int) m_vKeysounds.size() )
{
float factor = (tn.subType == TapNote::hold_head_roll ? 2.0f * fLifeFraction : 10.0f * fLifeFraction - 8.5f);
m_vKeysounds[tn.iKeysoundIndex].SetProperty ("Volume", max(0.0f, min(1.0f, factor)) * fVol);
}
} }
} }