- migrate a large part of the sound code to FSoundIDs.
This has always been a wild mixture of IDs and ints.
This commit is contained in:
parent
1a6da52961
commit
160633a4a2
35 changed files with 224 additions and 205 deletions
|
|
@ -153,10 +153,10 @@ void AddGenericVideo(DObject* runner, const FString& fn, int soundid, int fps)
|
|||
|
||||
int CutsceneDef::GetSound()
|
||||
{
|
||||
int id = -1;
|
||||
FSoundID id = INVALID_SOUND;
|
||||
if (soundName.IsNotEmpty()) id = soundEngine->FindSound(soundName);
|
||||
if (id <= 0) id = soundEngine->FindSoundByResID(soundID);
|
||||
return id;
|
||||
if (id == INVALID_SOUND) id = soundEngine->FindSoundByResID(soundID);
|
||||
return id.index();
|
||||
}
|
||||
|
||||
void CutsceneDef::Create(DObject* runner)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue