I forgot to stage in my last commit.
This commit is contained in:
@@ -0,0 +1,27 @@
|
||||
//
|
||||
// Created by Administrator on 2015-09-15.
|
||||
//
|
||||
|
||||
#ifndef DAYDREAM_ELIFELOST_H
|
||||
#define DAYDREAM_ELIFELOST_H
|
||||
|
||||
#include "Core/EventBroker.h"
|
||||
#include "Core/Entity.h"
|
||||
|
||||
namespace dd
|
||||
{
|
||||
|
||||
namespace Events
|
||||
{
|
||||
|
||||
struct LifeLost : Event
|
||||
{
|
||||
EntityID entity;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif //DAYDREAM_ELIFELOST_H
|
||||
@@ -14,7 +14,7 @@
|
||||
#include "Game/CBall.h"
|
||||
#include "Game/CLife.h"
|
||||
#include "Game/EStageCleared.h"
|
||||
#include "Game/EBallFellOffStage.h"
|
||||
#include "Game/ELifeLost.h"
|
||||
#include "Physics/CBoxShape.h"
|
||||
#include "Physics/CPhysics.h"
|
||||
#include "Physics/CCircleShape.h"
|
||||
@@ -68,10 +68,10 @@ public:
|
||||
|
||||
private:
|
||||
dd::EventRelay<LevelSystem, dd::Events::Contact> m_EContact;
|
||||
dd::EventRelay<LevelSystem, dd::Events::BallFellOffStage> m_EBall;
|
||||
dd::EventRelay<LevelSystem, dd::Events::LifeLost> m_ELifeLost;
|
||||
|
||||
bool OnContact(const dd::Events::Contact &event);
|
||||
bool BallFellOffStage(const dd::Events::BallFellOffStage &event);
|
||||
bool LifeLost(const dd::Events::LifeLost &event);
|
||||
|
||||
bool m_Initialized = false;
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "Physics/ESetImpulse.h"
|
||||
#include "Rendering/CSprite.h"
|
||||
#include "Game/CBall.h"
|
||||
#include "Game/EBallFellOffStage.h"
|
||||
#include "Game/ELifeLost.h"
|
||||
|
||||
|
||||
|
||||
@@ -46,14 +46,14 @@ private:
|
||||
dd::EventRelay<PadSystem, dd::Events::KeyDown> m_EKeyDown;
|
||||
dd::EventRelay<PadSystem, dd::Events::KeyUp> m_EKeyUp;
|
||||
dd::EventRelay<PadSystem, dd::Events::Contact> m_EContact;
|
||||
dd::EventRelay<PadSystem, dd::Events::BallFellOffStage> m_EBall;
|
||||
dd::EventRelay<PadSystem, dd::Events::LifeLost> m_ELifeLost;
|
||||
|
||||
bool OnKeyDown(const dd::Events::KeyDown &event);
|
||||
bool OnKeyUp(const dd::Events::KeyUp &event);
|
||||
|
||||
|
||||
bool OnContact(const dd::Events::Contact &event);
|
||||
bool BallFellOffStage(const dd::Events::BallFellOffStage &event);
|
||||
bool LifeLost(const dd::Events::LifeLost &event);
|
||||
|
||||
EntityID removeThisObject = NULL;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user