From 69f7944b23ec806a6ab6746e88fffee69c4173a9 Mon Sep 17 00:00:00 2001 From: Linda Andersson Date: Thu, 27 Feb 2014 15:30:21 +0100 Subject: [PATCH] Updating energy on UI --- Code/Game/GameClient/GameClientState/GameState.cpp | 1 + Code/Game/GameClient/GameClientState/GamingUI.cpp | 4 ++++ Code/Game/GameClient/GameClientState/GamingUI.h | 1 + Code/Game/GameLogic/AttatchmentMassDriver.cpp | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Code/Game/GameClient/GameClientState/GameState.cpp b/Code/Game/GameClient/GameClientState/GameState.cpp index 9d47762e..3300713d 100644 --- a/Code/Game/GameClient/GameClientState/GameState.cpp +++ b/Code/Game/GameClient/GameClientState/GameState.cpp @@ -714,6 +714,7 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState { // show my energy float energy = decoded.energy; + ((GamingUI*)this->gameUI)->SetEnergyText(std::to_wstring(energy)); } } return GameClientState::event_processed; diff --git a/Code/Game/GameClient/GameClientState/GamingUI.cpp b/Code/Game/GameClient/GameClientState/GamingUI.cpp index 717899a3..81d8af43 100644 --- a/Code/Game/GameClient/GameClientState/GamingUI.cpp +++ b/Code/Game/GameClient/GameClientState/GamingUI.cpp @@ -102,6 +102,10 @@ void GamingUI::SetHPtext( std::wstring hp ) { this->hp->setText(hp); } +void GamingUI::SetEnergyText( std::wstring energy ) +{ + this->energy->setText(energy); +} void GamingUI::ReadKeyInput() { if( this->key_forward ) this->sharedData->network->Send( Protocol_PlayerMovementForward() ); diff --git a/Code/Game/GameClient/GameClientState/GamingUI.h b/Code/Game/GameClient/GameClientState/GamingUI.h index d0d1121e..6179217a 100644 --- a/Code/Game/GameClient/GameClientState/GamingUI.h +++ b/Code/Game/GameClient/GameClientState/GamingUI.h @@ -25,6 +25,7 @@ namespace DanBias { namespace Client void RenderText() const; bool Release(); void SetHPtext( std::wstring hp ); + void SetEnergyText( std::wstring energy ); private: /* Overidden mouse methods */ void OnMouse ( const Input::Struct::MouseEventData& eventData ) override { } diff --git a/Code/Game/GameLogic/AttatchmentMassDriver.cpp b/Code/Game/GameLogic/AttatchmentMassDriver.cpp index 55ca3b3a..0443b4e1 100644 --- a/Code/Game/GameLogic/AttatchmentMassDriver.cpp +++ b/Code/Game/GameLogic/AttatchmentMassDriver.cpp @@ -144,10 +144,10 @@ void AttatchmentMassDriver::Update(float dt) if(currentEnergy > maxEnergy) currentEnergy = maxEnergy; - if(energyChange > 10) + if(energyChange > 5) { ((Game*)&Game::Instance())->onEnergyUpdateFnc( this->owner, currentEnergy); - energyChange = 0; + energyChange -= 5; } }