From 36c88e8b488016267a2a1d2a55daad4e17e919fa Mon Sep 17 00:00:00 2001 From: puzl Date: Fri, 5 May 2006 17:13:37 +0000 Subject: [PATCH] Mantis:0001114 o Fixed a bug with the marine hud not reseting correctly git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@447 67975925-1194-0748-b3d5-c16f83f1a3a1 --- releases/3.2.0/source/mod/AvHHud.cpp | 8 ++++++++ releases/3.2.0/source/mod/AvHPlayer.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/releases/3.2.0/source/mod/AvHHud.cpp b/releases/3.2.0/source/mod/AvHHud.cpp index 8c5a50aa..866f0e9b 100644 --- a/releases/3.2.0/source/mod/AvHHud.cpp +++ b/releases/3.2.0/source/mod/AvHHud.cpp @@ -657,6 +657,10 @@ void AvHHud::ClearData() this->mProgressBarDrawframe = PROGRESS_BAR_DEFAULT; this->mProgressBarLastDrawn = -10.0f; + + this->mHasWelder=false; + this->mHasMines=false; + this->mHasGrenades=false; } @@ -2578,6 +2582,10 @@ void AvHHud::ResetGame(bool inMapChanged) // :tankefugl this->mProgressBarLastDrawn = -10.0f; + + this->mHasGrenades=false; + this->mHasMines=false; + this->mHasWelder=false; } BIND_MESSAGE(SetGmma); diff --git a/releases/3.2.0/source/mod/AvHPlayer.cpp b/releases/3.2.0/source/mod/AvHPlayer.cpp index c46df743..58f1a7d2 100644 --- a/releases/3.2.0/source/mod/AvHPlayer.cpp +++ b/releases/3.2.0/source/mod/AvHPlayer.cpp @@ -7100,7 +7100,7 @@ void AvHPlayer::ResetEntity(void) this->mNewMap = theSavedNewMap; this->mDesiredNetName = theSavedDesiredNetName; this->mClientInfoLocations = theSavedClientInfoLocations; - + this->mMarineHUDUpgrades=0; } void AvHPlayer::ResetOverwatch()