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

Changed some files so it works with the changes in master. (weaponsystem,capturepoint,some tests)

Browse Source
This commit is contained in:
verysecrethero
2016-01-21 17:36:47 +01:00
parent 4d60f387ed
commit deb6ff1b16
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Systems/WeaponSystem.cpp
+4 -4
View File
@@ -1,7 +1,7 @@
#include "Systems/WeaponSystem.h"
WeaponSystem::WeaponSystem(EventBroker* eventBroker, IRenderer* renderer)
: System(eventBroker)
WeaponSystem::WeaponSystem(World* world, EventBroker* eventBroker, IRenderer* renderer)
: System(world, eventBroker)
, ImpureSystem()
, m_Renderer(renderer)
{
@@ -9,7 +9,7 @@ WeaponSystem::WeaponSystem(EventBroker* eventBroker, IRenderer* renderer)
EVENT_SUBSCRIBE_MEMBER(m_EShoot, &WeaponSystem::OnShoot);
}
void WeaponSystem::Update(World* world, double dt)
void WeaponSystem::Update(double dt)
{
for (int i = m_EShootVector.size(); i > 0; i--)
{
@@ -22,7 +22,7 @@ void WeaponSystem::Update(World* world, double dt)
continue;
}
//if its a player, do PlayerDamage event
const bool hasPlayerComponent = world->HasComponent(pickDataFromShot.Entity, "Player");
const bool hasPlayerComponent = m_World->HasComponent(pickDataFromShot.Entity, "Player");
if (hasPlayerComponent) {
Events::PlayerDamage ePlayerDamage;
//TODO: damage based on weapontype/class?