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

Conflicts:
	Escape-the-Dawn/Systems/SoundsSystem.cpp
This commit is contained in:
Adam
2014-03-09 20:10:34 +01:00
8 changed files with 70 additions and 26 deletions
+6 -5
View File
@@ -1,24 +1,25 @@
#ifndef SoundEmitter_h__
#define SoundEmitter_h__
#include "AL/al.h"
#include "AL/alc.h"
#include "System.h"
#include "Components/SoundEmitter.h"
#include <AL/al.h>
#include <AL/alc.h>
#include <windows.h>
namespace System
namespace Systems
{
class SoundSystem : public System
{
public:
SoundSystem(World* world) : System(world)
{
SoundSystem(World* world);
}
void Update(double dt) override;
void Update(double dt, EntityID entity, EntityID parent) override;
void UpdateEntity(double dt, EntityID entity, EntityID parent) override;
void OnComponentCreated(std::string type, std::shared_ptr<Component> component) override;
void PlaySound(std::shared_ptr<Components::SoundEmitter> emitter, std::string fileName);
void LoadFile(const char* fileName);