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

removed event that's not being used

Browse Source
This commit is contained in:
stiffly
2016-02-05 10:07:56 +01:00
parent d50caa1763
commit 71a86cab11
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Sound/SoundSystem.h
-5
View File
@@ -31,8 +31,6 @@
#include "Core/EPlayerDeath.h" #include "Core/EPlayerDeath.h"
#include "Core/EPlayerHealthPickup.h" #include "Core/EPlayerHealthPickup.h"
#include "Core/EComponentAttached.h" #include "Core/EComponentAttached.h"
#include "Core/EComponentDeleted.h"
#include "Core/EEntityDeleted.h"
#include "Collision/ETrigger.h" #include "Collision/ETrigger.h"
#include "Core/EPause.h" #include "Core/EPause.h"
#include "Game/Events/EDoubleJump.h" #include "Game/Events/EDoubleJump.h"
@@ -107,7 +105,6 @@ private:
bool m_EditorEnabled = false; bool m_EditorEnabled = false;
const double m_PlayerFootstepInterval = 1.0; const double m_PlayerFootstepInterval = 1.0;
double m_TimeSinceLastFootstep = 0; double m_TimeSinceLastFootstep = 0;
// TEMP
EntityID m_LocalPlayer = EntityID_Invalid; EntityID m_LocalPlayer = EntityID_Invalid;
bool m_LeftFoot = false; bool m_LeftFoot = false;
std::default_random_engine generator; std::default_random_engine generator;
@@ -145,8 +142,6 @@ private:
bool OnPlayerHealthPickup(const Events::PlayerHealthPickup &e); bool OnPlayerHealthPickup(const Events::PlayerHealthPickup &e);
EventRelay<SoundSystem, Events::ComponentAttached> m_EComponentAttached; EventRelay<SoundSystem, Events::ComponentAttached> m_EComponentAttached;
bool OnComponentAttached(const Events::ComponentAttached &e); bool OnComponentAttached(const Events::ComponentAttached &e);
EventRelay<SoundSystem, Events::ComponentDeleted> m_EComponentDeleted;
bool OnComponentDeleted(const Events::ComponentDeleted &e);
EventRelay<SoundSystem, Events::TriggerTouch> m_ETriggerTouch; EventRelay<SoundSystem, Events::TriggerTouch> m_ETriggerTouch;
bool OnTriggerTouch(const Events::TriggerTouch &e); bool OnTriggerTouch(const Events::TriggerTouch &e);
EventRelay<SoundSystem, Events::Pause> m_EPause; EventRelay<SoundSystem, Events::Pause> m_EPause;
src/Engine/Sound/SoundSystem.cpp
+1 -10
View File
@@ -177,7 +177,6 @@ void SoundSystem::playQueue(QueuedBuffers qb)
alSourcePlay(qb.first); alSourcePlay(qb.first);
} }
void SoundSystem::stopSound(Source* source) void SoundSystem::stopSound(Source* source)
{ {
alSourceStop(source->ALsource); alSourceStop(source->ALsource);
@@ -402,7 +401,7 @@ bool SoundSystem::OnPlayerDamage(const Events::PlayerDamage & e)
source->Type = SoundType::SFX; source->Type = SoundType::SFX;
m_Sources[child] = source; m_Sources[child] = source;
// breathe // Breathe
std::vector<ALuint> buffers; std::vector<ALuint> buffers;
buffers.push_back(source->SoundResource->Buffer()); buffers.push_back(source->SoundResource->Buffer());
int ammountOfbreaths = (static_cast<int>(e.Damage) / 10) + 2; // TEMP: Idk something stupid like this shit int ammountOfbreaths = (static_cast<int>(e.Damage) / 10) + 2; // TEMP: Idk something stupid like this shit
@@ -452,14 +451,6 @@ bool SoundSystem::OnComponentAttached(const Events::ComponentAttached & e)
return false; return false;
} }
bool SoundSystem::OnComponentDeleted(const Events::ComponentDeleted & e)
{
if (e.ComponentType == "SoundEmitter") {
}
return false;
}
bool SoundSystem::OnTriggerTouch(const Events::TriggerTouch & e) bool SoundSystem::OnTriggerTouch(const Events::TriggerTouch & e)
{ {
if (m_World->HasComponent(e.Trigger.ID, "CapturePoint")) { if (m_World->HasComponent(e.Trigger.ID, "CapturePoint")) {