BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Browse Source 
Conflicts:
	Escape-the-Dawn/Systems/PlayerSystem.cpp
This commit is contained in:
sippeangelo
2015-06-02 00:08:35 +02:00
parent 074b2d6348 66303dfd6a
commit f2de6025eb
8 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/Systems/PlayerSystem.cpp
+14
View File
@@ -14,6 +14,7 @@ Systems::PlayerSystem::PlayerSystem( World* world ) : System(world)
m_poweruptimeleft = 0;
m_basespeed = 125.f;
m_maxspeed = 125.f;
}
void Systems::PlayerSystem::Update(double dt)
@@ -195,7 +196,20 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
{
if(m_World->GetProperty<std::string>(ent, "Name") == "Obstacle")
{
auto deathSoundEntity = m_World->CreateEntity(ent);
auto deathTransform = m_World->AddComponent<Components::Transform>(deathSoundEntity, "Transform");
auto deathSoundEmitter = m_World->AddComponent<Components::SoundEmitter>(deathSoundEntity, "SoundEmitter");
deathSoundEmitter->Gain = 5.f;
deathSoundEmitter->ReferenceDistance = 1.5f;
auto deathSoundSystem = m_World->GetSystem<Systems::SoundSystem>("SoundSystem");
deathSoundSystem->PlaySound(deathSoundEmitter.get(), "Sounds/Explosion3.wav");
m_World->RemoveEntity(entity);
//TODO: Ljud som kommer från crashsite
}
if (m_World->GetProperty<std::string>(ent, "Name") == "Obstacle_SoundTrigger")