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

Merge branch 'master' into OctTree

Browse Source 
# Conflicts:
#	src/Engine/CMakeLists.txt
#	src/Game/Game.cpp
This commit is contained in:
William Moberg
2015-12-15 17:11:11 +01:00
parent ed82a0939a 51dd627ae3
commit 04a01104b5
73 changed files with 2615 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/PlayerSystem.h
+3 -3
View File
@@ -19,11 +19,11 @@ struct KeyInput
bool Right = false;
};
class PlayerSystem : public System
class PlayerSystem : public PureSystem
{
public:
PlayerSystem(EventBroker* eventBroker)
: System(eventBroker, "Player")
: PureSystem(eventBroker, "Player")
{
EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &PlayerSystem::OnKeyDown);
EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &PlayerSystem::OnKeyUp);
@@ -32,7 +32,7 @@ public:
EVENT_SUBSCRIBE_MEMBER(m_ELeave, &PlayerSystem::OnLeave);
}
virtual void Update(World* world, ComponentWrapper& player, double dt) override;
virtual void UpdateComponent(World* world, ComponentWrapper& player, double dt) override;
private:
float m_Speed = 5;