Merge branch 'HEAD' of git@github.com:FacialTurd/The-Powder-Toy.git

1 files changed, 8 insertions, 5 deletions

diff --git a/src/gui/game/GameView.h b/src/gui/game/GameView.h
index 093d80b..328b67c 100644
--- a/src/gui/game/GameView.h
+++ b/src/gui/game/GameView.h
@@ -51,18 +51,20 @@ private:
 	bool showDebug;
 	bool wallBrush;
 	int introText;
-	int buttonTipShow;
-	std::string buttonTip;
 	std::string introTextMessage;
 	int toolIndex;
 	int currentSaveType;
-	Menu * lastMenu;
+	int lastMenu;
 
-	int infoTipPresence;
+	int toolTipPresence;
 	std::string toolTip;
+	bool isToolTipFadingIn;
 	ui::Point toolTipPosition;
+	int infoTipPresence;
 	std::string infoTip;
-	int toolTipPresence;
+	int buttonTipShow;
+	std::string buttonTip;
+	bool isButtonTipFadingIn;
 
 	queue<ui::Point> pointQueue;
 	GameController * c;
@@ -128,6 +130,7 @@ public:
     ui::Point GetMousePosition();
     void SetSample(SimulationSample sample);
 	void SetHudEnable(bool hudState);
+	bool GetHudEnable();
     bool CtrlBehaviour(){ return ctrlBehaviour; }
     bool ShiftBehaviour(){ return shiftBehaviour; }
 	void ExitPrompt();