NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

post merge fixes

This commit is contained in:
Dander7BD 2014-02-21 12:18:46 +01:00
parent 60a5ddc79d
commit 40276391af
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Code/Game/GameClient/GameClientState/GameState.cpp
View File

@ -207,8 +207,7 @@ bool GameState::Render()
} }
} }
#ifdef _DEBUG #ifdef _DEBUG //RB DEBUG render wire frame
//RB DEBUG render wire frame
if(this->renderWhireframe) if(this->renderWhireframe)
{ {
Oyster::Graphics::API::StartRenderWireFrame(); Oyster::Graphics::API::StartRenderWireFrame();
@ -248,8 +247,7 @@ bool GameState::Render()
} }
} }
} }
//!RB DEBUG #endif //!RB DEBUG
#endif
Oyster::Graphics::API::StartGuiRender(); Oyster::Graphics::API::StartGuiRender();
// render gui elemnts // render gui elemnts
@ -372,7 +370,7 @@ void GameState::ReadKeyInput()
#endif // !DEGUG KEYS #endif // !DEGUG KEYS
// toggle wire frame render // toggle wire frame render
if( this->privData->input->IsKeyPressed(DIK_TAB) ) if( this->privData->keyboardInput->IsKeyDown(::Input::Enum::SAKI_Tab) )
{ {
if( !this->key_showStats ) if( !this->key_showStats )
{ {