From 6598ac870adef7c519a06a0961c512e9937b5009 Mon Sep 17 00:00:00 2001 From: pierow Date: Thu, 31 Aug 2023 00:11:11 -0400 Subject: [PATCH] spectators can see hive and research info -could use some clean up --- main/source/mod/AvHPlayer.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/main/source/mod/AvHPlayer.cpp b/main/source/mod/AvHPlayer.cpp index 403374bb..b8e795e6 100644 --- a/main/source/mod/AvHPlayer.cpp +++ b/main/source/mod/AvHPlayer.cpp @@ -9445,25 +9445,26 @@ void AvHPlayer::UpdateAmbientSounds() void AvHPlayer::UpdateAlienUI() { - AvHTeam* theTeamPointer = this->GetTeamPointer(); - bool theIsMarine = false; + //AvHTeam* theTeamPointer = this->GetTeamPointer(); + //bool theIsMarine = false; bool theIsAlien = false; - if(this->GetIsAlien()) + if(this->GetIsAlien(true)) { theIsAlien = true; } - else if(this->GetIsMarine()) + if(this->GetIsMarine()) { - theIsMarine = true; + return; + //theIsMarine = true; } // Update when going back to ready room, so check if not-marine instead of is-alien - if(!theIsMarine) - { + //if(!theIsMarine) + //{ bool theCanRespawn = GetGameRules()->FPlayerCanRespawn(this); - AvHTeam* theTeamPointer = this->GetTeamPointer(); + AvHTeam* theTeamPointer = this->GetTeamPointer(true); if(theTeamPointer) { AvHAlienUpgradeListType theUpgrades = theTeamPointer->GetAlienUpgrades(); @@ -9512,12 +9513,13 @@ void AvHPlayer::UpdateAlienUI() NetMsg_HUDSetUpgrades(this->pev, teamMask); } } - } + //} } void AvHPlayer::UpdateMarineUI() { - AvHTeam* theTeamPointer = this->GetTeamPointer(); + //AvHTeam* theTeamPointer = this->GetTeamPointer(); + AvHTeam* theTeamPointer = this->GetTeamPointer(true); bool theIsMarine = false; bool theIsAlien = false;