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

Removed ShootEvent from CapturePoint

Browse Source
This commit is contained in:
verysecrethero
2016-01-15 11:17:22 +01:00
parent 76a8b43ca3
commit c8fe6853c0
13 changed files with 0 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/PlayerSystem.h
-10
View File
@@ -8,7 +8,6 @@
#include "Core/System.h"
#include "Collision/ETrigger.h"
#include "Core/EMouseRelease.h"
#include "Core/EShoot.h"
class PlayerSystem : public PureSystem
{
@@ -19,14 +18,11 @@ public:
EVENT_SUBSCRIBE_MEMBER(m_ETouch, &PlayerSystem::OnTouch);
EVENT_SUBSCRIBE_MEMBER(m_EEnter, &PlayerSystem::OnEnter);
EVENT_SUBSCRIBE_MEMBER(m_ELeave, &PlayerSystem::OnLeave);
EVENT_SUBSCRIBE_MEMBER(m_MouseRelease, &PlayerSystem::OnMouseRelease);
}
virtual void UpdateComponent(World* world, ComponentWrapper& player, double dt) override;
private:
float m_Speed = 5;
bool leftMouseWasReleased = false;
glm::vec2 aimingCoordinates;
EventRelay<PlayerSystem, Events::TriggerEnter> m_EEnter;
bool OnEnter(const Events::TriggerEnter &event);
EventRelay<PlayerSystem, Events::TriggerTouch> m_ETouch;
@@ -34,12 +30,6 @@ private:
EventRelay<PlayerSystem, Events::TriggerLeave> m_ELeave;
bool PlayerSystem::OnLeave(const Events::TriggerLeave &event);
EventRelay<PlayerSystem, Events::MouseRelease> m_MouseRelease;
bool PlayerSystem::OnMouseRelease(const Events::MouseRelease& e);
enum class HeldItem {
None = 0,
PrimaryItem = 1,
SecondaryItem = 2
};
};
#endif