Merge pull request #21 from CegepSTH/SQC_21_MenuSoloMulti
Push menu solo ou multi.
This commit is contained in:
@@ -39,8 +39,6 @@ public:
|
||||
virtual void MouseReleaseEvent(const MOUSE_BUTTON &button, int x, int y);
|
||||
|
||||
private:
|
||||
std::pair<float, float> GetScale() const;
|
||||
|
||||
int GetFps(float elapsedTime) const;
|
||||
int GetCountdown(float elapsedTime);
|
||||
|
||||
@@ -74,6 +72,8 @@ private:
|
||||
Texture m_texturePovGun;
|
||||
Texture m_textureSkybox;
|
||||
Texture m_textureSoloMultiMenu;
|
||||
Texture m_textureSoloText;
|
||||
Texture m_textureMultiText;
|
||||
Texture m_textureTitle;
|
||||
|
||||
Skybox m_skybox;
|
||||
@@ -102,6 +102,8 @@ private:
|
||||
float m_scale;
|
||||
float m_time = 0;
|
||||
float m_time_SplashScreen = 0;
|
||||
float m_titleX = 0;
|
||||
float m_titleY = 0;
|
||||
float m_Width = 0;
|
||||
float m_Height = 0;
|
||||
|
||||
@@ -118,7 +120,7 @@ private:
|
||||
bool m_displayHud = true;
|
||||
bool m_displayInfo = false;
|
||||
bool m_resetcountdown = false;
|
||||
bool m_soloMultiChoiceMade = true;
|
||||
bool m_soloMultiChoiceMade = false;
|
||||
bool m_stopcountdown = false;
|
||||
|
||||
bool m_keyK = false;
|
||||
|
Reference in New Issue
Block a user