Animations in the game

This commit is contained in:
viktorljung
2015-10-23 14:35:11 +02:00
parent 67ef462a53
commit 6206859568
7 changed files with 105 additions and 61 deletions
+3
View File
@@ -49,6 +49,7 @@
#include "Physics/ECreateParticleSequence.h"
#include "Sound/CCollisionSound.h"
#include "Rendering/EAnimationComplete.h"
namespace dd
{
@@ -144,6 +145,7 @@ private:
dd::EventRelay<BallSystem, dd::Events::ActionButton> m_EActionButton;
dd::EventRelay<BallSystem, dd::Events::StageCleared> m_EStageCleared;
dd::EventRelay<BallSystem, dd::Events::ArrivedAtNewStage> m_EArrivedAtNewStage;
dd::EventRelay<BallSystem, dd::Events::AnimationComplete> m_EAnimationComplete;
bool Contact(const Events::Contact &event);
bool OnMultiBallLost(const dd::Events::MultiBallLost &event);
@@ -159,6 +161,7 @@ private:
bool OnActionButton(const dd::Events::ActionButton &event);
bool OnStageCleared(const dd::Events::StageCleared &event);
bool OnArrivedToNewStage(const dd::Events::ArrivedAtNewStage &event);
bool OnAnimationComplete(const dd::Events::AnimationComplete &event);
};
}
+1 -1
View File
@@ -145,7 +145,7 @@ private:
bool m_Pause = false;
int m_LooseBricks = 0;
int m_CurrentCluster = 1;
int m_CurrentLevel = 4;
int m_CurrentLevel = 1;
int m_MultiBalls = 0;
int m_PowerUps = 0;
int m_Score = 0;
+1 -1
View File
@@ -9,7 +9,7 @@ namespace dd
namespace Events
{
struct AnimationComplete
struct AnimationComplete : Event
{
EntityID Entity;
std::string Animation;