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

InGame keys: Go to mainMenu with M. Exit client with ESC. Fix drop in drop out correctly.

This commit is contained in:
Linda Andersson 2014-02-26 11:53:33 +01:00
parent 16ca665311
commit 934bc80b62
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,19 +153,28 @@ void GameState::InitiatePlayer( int id, const std::string &modelName, const floa
GameClientState::ClientState GameState::Update( float deltaTime ) GameClientState::ClientState GameState::Update( float deltaTime )
{ {
GameStateUI::UIState UIstate = this->currGameUI->Update( deltaTime ); GameStateUI::UIState UIstate = this->gameUI->Update( deltaTime );
switch (UIstate) switch (UIstate)
{ {
case DanBias::Client::GameStateUI::UIState_shut_down:
{
this->privData->nextState = ClientState_Quit;
// disconnect
}
break;
case DanBias::Client::GameStateUI::UIState_same: case DanBias::Client::GameStateUI::UIState_same:
break; break;
case DanBias::Client::GameStateUI::UIState_gaming: case DanBias::Client::GameStateUI::UIState_gaming:
break; break;
case DanBias::Client::GameStateUI::UIState_main_menu: case DanBias::Client::GameStateUI::UIState_main_menu:
//this->privData->nextState = {
break; this->privData->nextState = ClientState_Main;
case DanBias::Client::GameStateUI::UIState_shut_down: // disconnect
this->privData->nextState = ClientState_Quit; }
break; break;
default: default:
break; break;
} }

6
Code/Game/GameClient/GameClientState/GamingUI.cpp
View File

@ -17,6 +17,7 @@ GamingUI::GamingUI() :
this->camera = nullptr; this->camera = nullptr;
this->plane = nullptr; this->plane = nullptr;
this->text = nullptr; this->text = nullptr;
this->nextState = GameStateUI::UIState_same;
} }
GamingUI::GamingUI( InputClass *input, NetworkClient *connection, Camera_FPSV2 *camera ) : GamingUI::GamingUI( InputClass *input, NetworkClient *connection, Camera_FPSV2 *camera ) :
@ -25,6 +26,7 @@ GamingUI::GamingUI( InputClass *input, NetworkClient *connection, Camera_FPSV2 *
this->input = input; this->input = input;
this->netClient = connection; this->netClient = connection;
this->camera = camera; this->camera = camera;
this->nextState = GameStateUI::UIState_same;
} }
GamingUI::~GamingUI() { /* Do nothing */ } GamingUI::~GamingUI() { /* Do nothing */ }
@ -169,6 +171,10 @@ void GamingUI::ReadKeyInput()
{ {
this->nextState = GameStateUI::UIState_shut_down; this->nextState = GameStateUI::UIState_shut_down;
} }
if( this->input->IsKeyPressed(DIK_M) )
{
this->nextState = GameStateUI::UIState_main_menu;
}
// !DEGUG KEYS // !DEGUG KEYS
// TODO: implement sub-menu // TODO: implement sub-menu
} }