From 40276391af8482d24b534a77c43c4c134a6cd7f9 Mon Sep 17 00:00:00 2001
From: Dander7BD <dander.1981@gmail.com>
Date: Fri, 21 Feb 2014 12:18:46 +0100
Subject: [PATCH] post merge fixes

---
 Code/Game/GameClient/GameClientState/GameState.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Code/Game/GameClient/GameClientState/GameState.cpp b/Code/Game/GameClient/GameClientState/GameState.cpp
index 71a984c9..bb0bdc90 100644
--- a/Code/Game/GameClient/GameClientState/GameState.cpp
+++ b/Code/Game/GameClient/GameClientState/GameState.cpp
@@ -207,8 +207,7 @@ bool GameState::Render()
 		}
 	}
 
-#ifdef _DEBUG
-	//RB DEBUG render wire frame 
+#ifdef _DEBUG //RB DEBUG render wire frame 
 		if(this->renderWhireframe)
 		{
 			Oyster::Graphics::API::StartRenderWireFrame();
@@ -248,8 +247,7 @@ bool GameState::Render()
 				}
 			}
 		}
-		//!RB DEBUG 
-#endif
+#endif //!RB DEBUG 
 
 	Oyster::Graphics::API::StartGuiRender();
 	// render gui elemnts
@@ -372,7 +370,7 @@ void GameState::ReadKeyInput()
 #endif // !DEGUG KEYS
 
 	// toggle wire frame render
-	if( this->privData->input->IsKeyPressed(DIK_TAB) )
+	if( this->privData->keyboardInput->IsKeyDown(::Input::Enum::SAKI_Tab) )
 	{
 		if( !this->key_showStats )
 		{