Getting Sticky after Ink Blaster now works.

This commit is contained in:
PlatinumSkink
2015-10-08 21:51:27 +02:00
parent 3793515968
commit f6f74c659f
6 changed files with 85 additions and 20 deletions
+5
View File
@@ -23,6 +23,7 @@
#include "Game/EMultiBallLost.h"
#include "Game/EStickyPad.h"
#include "Game/EInkBlaster.h"
#include "Game/EInkBlasterOver.h"
#include "Game/EGameOver.h"
#include "Game/EPause.h"
#include "Game/EHitPad.h"
@@ -96,6 +97,8 @@ private:
bool m_Waiting = true;
bool m_Sticky = false;
bool m_InkBlaster = false;
bool m_InkAttached = false;
bool m_BlockedWaiting = false;
int m_StickyCounter = 5;
glm::vec3 m_SavedSpeed;
@@ -112,6 +115,7 @@ private:
dd::EventRelay<BallSystem, dd::Events::MultiBall> m_EMultiBall;
dd::EventRelay<BallSystem, dd::Events::StickyPad> m_EStickyPad;
dd::EventRelay<BallSystem, dd::Events::InkBlaster> m_EInkBlaster;
dd::EventRelay<BallSystem, dd::Events::InkBlasterOver> m_EInkBlasterOver;
dd::EventRelay<BallSystem, dd::Events::Pause> m_EPause;
dd::EventRelay<BallSystem, dd::Events::Contact> m_Contact;
dd::EventRelay<BallSystem, dd::Events::ActionButton> m_EActionButton;
@@ -123,6 +127,7 @@ private:
bool OnMultiBall(const dd::Events::MultiBall &event);
bool OnStickyPad(const dd::Events::StickyPad &event);
bool OnInkBlaster(const dd::Events::InkBlaster &event);
bool OnInkBlasterOver(const dd::Events::InkBlasterOver &event);
bool OnPause(const dd::Events::Pause &event);
bool OnActionButton(const dd::Events::ActionButton &event);
};
+25
View File
@@ -0,0 +1,25 @@
//
// Created by Adniklastrator on 2015-10-08.
//
#ifndef DAYDREAM_EINKBLASTEROVER_H
#define DAYDREAM_EINKBLASTEROVER_H
#include "Core/EventBroker.h"
namespace dd
{
namespace Events
{
struct InkBlasterOver : Event
{
EntityID Ball;
};
}
}
#endif //DAYDREAM_EINKBLASTEROVER_H
+2
View File
@@ -10,12 +10,14 @@
#include "Core/CTemplate.h"
#include "Core/EventBroker.h"
#include "Core/World.h"
#include "Core/EventBroker.h"
#include "Physics/EContact.h"
#include "Rendering/CModel.h"
#include "Physics/CPhysics.h"
#include "Physics/CCircleShape.h"
#include "Game/EPause.h"
#include "Game/EInkBlaster.h"
#include "Game/EInkBlasterOver.h"
#include "Game/EActionButton.h"
#include "Game/EHitPad.h"
#include "Game/CProjectile.h"