From 6cfaed0e1be5db3f60b94693747a58726c064756 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Thu, 23 Nov 2017 00:07:47 -0500
Subject: [PATCH] fix compile warnings, fix tooltips fading in too slowly

---
 src/gui/elementsearch/ElementSearchActivity.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gui/elementsearch/ElementSearchActivity.cpp b/src/gui/elementsearch/ElementSearchActivity.cpp
index f9c647c25..33cabfd03 100644
--- a/src/gui/elementsearch/ElementSearchActivity.cpp
+++ b/src/gui/elementsearch/ElementSearchActivity.cpp
@@ -27,12 +27,13 @@ ElementSearchActivity::ElementSearchActivity(GameController * gameController, st
 	firstResult(NULL),
 	gameController(gameController),
 	tools(tools),
+	toolTip(""),
+	toolTipPresence(0),
 	shiftPressed(false),
 	ctrlPressed(false),
 	altPressed(false),
-	exit(false),
-	toolTip(""),
-	isToolTipFadingIn(false)
+	isToolTipFadingIn(false),
+	exit(false)
 {
 	ui::Label * title = new ui::Label(ui::Point(4, 5), ui::Point(Size.X-8, 15), "Element Search");
 	title->SetTextColour(style::Colour::InformationTitle);
@@ -211,7 +212,7 @@ void ElementSearchActivity::OnTick(float dt)
 		if (toolTipPresence < 120)
 			toolTipPresence += int(dt*2)>1?int(dt*2):2;
 	}
-	if (toolTipPresence>0)
+	else if (toolTipPresence>0)
 	{
 		toolTipPresence -= int(dt)>0?int(dt):1;
 		if (toolTipPresence<0)