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

A metric ton of minifixes!

Browse Source
This commit is contained in:
PlatinumSkink
2015-10-21 15:46:32 +02:00
parent f0b36c6f12 e9942dad4a
commit ff3813a7cf
24 changed files with 1911 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/GUI/HUD.h
+9
View File
@@ -51,6 +51,7 @@ public:
EVENT_SUBSCRIBE_MEMBER(m_EGameOver, &HUD::OnGameOver);
EVENT_SUBSCRIBE_MEMBER(m_ClusterClear, &HUD::OnClusterClear);
EVENT_SUBSCRIBE_MEMBER(m_KrakenAttack, &HUD::OnKrakenAttack);
EVENT_SUBSCRIBE_MEMBER(m_KrakenAttackEnd, &HUD::OnKrakenAttackEnd);
updateScore();
}
@@ -71,6 +72,7 @@ private:
EventRelay<Frame, Events::GameOver> m_EGameOver;
EventRelay<Frame, Events::ClusterClear> m_ClusterClear;
EventRelay<Frame, Events::KrakenAttack> m_KrakenAttack;
EventRelay<Frame, Events::KrakenAttackEnd> m_KrakenAttackEnd;
void updateScore()
{
@@ -122,6 +124,13 @@ private:
return true;
}
bool OnKrakenAttackEnd(const Events::KrakenAttackEnd& event)
{
m_KrakenAttackSlider->Hide();
return true;
}
};
}
include/Game/GUI/LoadingFrame.h
+4
View File
@@ -5,6 +5,7 @@
#include "GUI/Slider.h"
#include "Core/ResourceManager.h"
#include "Game/GUI/ELoadingFrameComplete.h"
#include "Sound/EPlaySound.h"
namespace dd
{
@@ -56,6 +57,9 @@ public:
e.FrameName = Name();
e.Frame = this;
EventBroker->Publish(e);
Events::PlaySound se;
se.FilePath = "Sounds/jap-story.wav";
EventBroker->Publish(se);
}
}
}