Changeset View
Changeset View
Standalone View
Standalone View
ps/trunk/source/soundmanager/SoundManager.cpp
| /* Copyright (C) 2015 Wildfire Games. | /* Copyright (C) 2017 Wildfire Games. | ||||
| * This file is part of 0 A.D. | * This file is part of 0 A.D. | ||||
| * | * | ||||
| * 0 A.D. is free software: you can redistribute it and/or modify | * 0 A.D. is free software: you can redistribute it and/or modify | ||||
| * it under the terms of the GNU General Public License as published by | * it under the terms of the GNU General Public License as published by | ||||
| * the Free Software Foundation, either version 2 of the License, or | * the Free Software Foundation, either version 2 of the License, or | ||||
| * (at your option) any later version. | * (at your option) any later version. | ||||
| * | * | ||||
| * 0 A.D. is distributed in the hope that it will be useful, | * 0 A.D. is distributed in the hope that it will be useful, | ||||
| ▲ Show 20 Lines • Show All 624 Lines • ▼ Show 20 Lines | void CSoundManager::SetMusicEnabled(bool isEnabled) | ||||
| if (m_CurrentTune && !isEnabled) | if (m_CurrentTune && !isEnabled) | ||||
| { | { | ||||
| m_CurrentTune->FadeAndDelete(1.00); | m_CurrentTune->FadeAndDelete(1.00); | ||||
| m_CurrentTune = NULL; | m_CurrentTune = NULL; | ||||
| } | } | ||||
| m_MusicEnabled = isEnabled; | m_MusicEnabled = isEnabled; | ||||
| } | } | ||||
| void CSoundManager::PlayAsGroup(const VfsPath& groupPath, CVector3D sourcePos, entity_id_t source, bool ownedSound) | void CSoundManager::PlayAsGroup(const VfsPath& groupPath, const CVector3D& sourcePos, entity_id_t source, bool ownedSound) | ||||
| { | { | ||||
| // Make sure the sound group is loaded | // Make sure the sound group is loaded | ||||
| CSoundGroup* group; | CSoundGroup* group; | ||||
| if (m_SoundGroups.find(groupPath.string()) == m_SoundGroups.end()) | if (m_SoundGroups.find(groupPath.string()) == m_SoundGroups.end()) | ||||
| { | { | ||||
| group = new CSoundGroup(); | group = new CSoundGroup(); | ||||
| if (!group->LoadSoundGroup(L"audio/" + groupPath.string())) | if (!group->LoadSoundGroup(L"audio/" + groupPath.string())) | ||||
| { | { | ||||
| ▲ Show 20 Lines • Show All 169 Lines • Show Last 20 Lines | |||||
Wildfire Games · Phabricator