Fixed Sticky after Ink bug, fixed directions on Squid after sticky, laser direction is in background. Brick Components implemented, though they do nothing.

This commit is contained in:
PlatinumSkink
2015-10-12 16:45:59 +02:00
parent 8f2af7ca8f
commit 5630771272
16 changed files with 286 additions and 12 deletions
+8
View File
@@ -24,8 +24,11 @@
#include "Game/CBall.h"
#include "Game/CPad.h"
#include "Game/CPowerUp.h"
#include "Game/CStickyAim.h"
#include "Game/EResetBall.h"
#include "Game/EMultiBall.h"
#include "Game/EStickyPad.h"
#include "Game/EInkBlaster.h"
#include "Game/EKrakenAttack.h"
#include "Game/EPowerUpTaken.h"
#include "Game/EStageCleared.h"
@@ -78,12 +81,15 @@ private:
bool m_ReplaceBall = false;
bool m_MultiBall = false;
bool m_KrakenAttack = false;
bool m_BallStuck = false;
double m_KrakenCharge = 0;
double m_KrakenStrength = 0;
double m_PlayerStrength = 0;
float m_Edge = 2.8f;
Components::Transform* m_Transform = nullptr;
Components::Pad* m_Pad = nullptr;
std::shared_ptr<Components::Transform> m_StickTransform;
std::shared_ptr<Components::StickyAim> m_StickyAim;
bool m_Pause = false;
@@ -94,6 +100,7 @@ private:
dd::EventRelay<PadSystem, dd::Events::StageCleared> m_EStageCleared;
dd::EventRelay<PadSystem, dd::Events::Pause> m_EPause;
dd::EventRelay<PadSystem, dd::Events::KrakenAttack> m_EKrakenAttack;
dd::EventRelay<PadSystem, dd::Events::StickyPad> m_EStickyPad;
dd::EventRelay<PadSystem, dd::Events::ActionButton> m_EActionButton;
bool OnKeyDown(const dd::Events::KeyDown &event);
@@ -103,6 +110,7 @@ private:
bool OnStageCleared(const dd::Events::StageCleared &event);
bool OnPause(const dd::Events::Pause &event);
bool OnKrakenAttack(const dd::Events::KrakenAttack &event);
bool OnStickyPad(const dd::Events::StickyPad &event);
bool OnActionButton(const dd::Events::ActionButton &event);
class PadSteeringInputController;