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

InkBlaster functions as intended! It just needs ink!

Browse Source
This commit is contained in:
PlatinumSkink
2015-10-08 20:02:51 +02:00
parent c76033113d
commit 5c2844c137
15 changed files with 350 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/BallSystem.h
+4 -1
View File
@@ -22,6 +22,7 @@
#include "Game/EMultiBall.h"
#include "Game/EMultiBallLost.h"
#include "Game/EStickyPad.h"
#include "Game/EInkBlaster.h"
#include "Game/EGameOver.h"
#include "Game/EPause.h"
#include "Game/EHitPad.h"
@@ -93,8 +94,8 @@ private:
bool m_Pause = false;
bool m_Waiting = true;
bool m_Sticky = false;
bool m_InkBlaster = false;
int m_StickyCounter = 5;
EntityID m_LastCollision = 999999;
glm::vec3 m_SavedSpeed;
bool m_InitializePause = false;
@@ -109,6 +110,7 @@ private:
dd::EventRelay<BallSystem, dd::Events::ResetBall> m_EResetBall;
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::Pause> m_EPause;
dd::EventRelay<BallSystem, dd::Events::Contact> m_Contact;
dd::EventRelay<BallSystem, dd::Events::ActionButton> m_EActionButton;
@@ -119,6 +121,7 @@ private:
bool OnResetBall(const dd::Events::ResetBall &event);
bool OnMultiBall(const dd::Events::MultiBall &event);
bool OnStickyPad(const dd::Events::StickyPad &event);
bool OnInkBlaster(const dd::Events::InkBlaster &event);
bool OnPause(const dd::Events::Pause &event);
bool OnActionButton(const dd::Events::ActionButton &event);
};