BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into FMOD

Browse Source 
Conflicts:
	src/GameWorld.cpp
	src/Systems/SoundSystem.h
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
Stiffly
2014-05-25 01:42:26 +02:00
parent 3a638a356c 1bf5a8464e
commit ad902cb511
58 changed files with 1860 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Systems/SoundSystem.h
+1 -1
View File
@@ -32,7 +32,7 @@ public:
private:
// Events
EventRelay<Events::PlaySound> m_EPlaySound;
EventRelay<SoundSystem, Events::PlaySound> m_EPlaySound;
FMOD_RESULT LoadSound(FMOD_SOUND*&, std::string, float, float, bool, float, float);
void PlaySound(FMOD_CHANNEL*, FMOD_SOUND*, float volume, bool loop);