mirror of
https://github.com/ENSL/NS.git
synced 2025-02-01 21:51:03 +00:00
spectators can see hive and research info
-could use some clean up
This commit is contained in:
parent
98b815da57
commit
6598ac870a
1 changed files with 12 additions and 10 deletions
|
@ -9445,25 +9445,26 @@ void AvHPlayer::UpdateAmbientSounds()
|
||||||
|
|
||||||
void AvHPlayer::UpdateAlienUI()
|
void AvHPlayer::UpdateAlienUI()
|
||||||
{
|
{
|
||||||
AvHTeam* theTeamPointer = this->GetTeamPointer();
|
//AvHTeam* theTeamPointer = this->GetTeamPointer();
|
||||||
bool theIsMarine = false;
|
//bool theIsMarine = false;
|
||||||
bool theIsAlien = false;
|
bool theIsAlien = false;
|
||||||
|
|
||||||
if(this->GetIsAlien())
|
if(this->GetIsAlien(true))
|
||||||
{
|
{
|
||||||
theIsAlien = 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
|
// 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);
|
bool theCanRespawn = GetGameRules()->FPlayerCanRespawn(this);
|
||||||
|
|
||||||
AvHTeam* theTeamPointer = this->GetTeamPointer();
|
AvHTeam* theTeamPointer = this->GetTeamPointer(true);
|
||||||
if(theTeamPointer)
|
if(theTeamPointer)
|
||||||
{
|
{
|
||||||
AvHAlienUpgradeListType theUpgrades = theTeamPointer->GetAlienUpgrades();
|
AvHAlienUpgradeListType theUpgrades = theTeamPointer->GetAlienUpgrades();
|
||||||
|
@ -9512,12 +9513,13 @@ void AvHPlayer::UpdateAlienUI()
|
||||||
NetMsg_HUDSetUpgrades(this->pev, teamMask);
|
NetMsg_HUDSetUpgrades(this->pev, teamMask);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AvHPlayer::UpdateMarineUI()
|
void AvHPlayer::UpdateMarineUI()
|
||||||
{
|
{
|
||||||
AvHTeam* theTeamPointer = this->GetTeamPointer();
|
//AvHTeam* theTeamPointer = this->GetTeamPointer();
|
||||||
|
AvHTeam* theTeamPointer = this->GetTeamPointer(true);
|
||||||
bool theIsMarine = false;
|
bool theIsMarine = false;
|
||||||
bool theIsAlien = false;
|
bool theIsAlien = false;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue