mirror of
https://github.com/ENSL/NS.git
synced 2024-11-10 07:11:38 +00:00
o Fixed an issue with the changes to webstrand rendering
o Fixed an issue with hive +use git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@563 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
parent
e0fc5bcd37
commit
f5f42ace3a
2 changed files with 2 additions and 1 deletions
|
@ -2810,7 +2810,7 @@ int AddToFullPack( struct entity_state_s *state, int e, edict_t *ent, edict_t *h
|
||||||
marineGlow = true;
|
marineGlow = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(( marineGlow || (ent->v.team == theReceivingPlayer->pev->team)) && (ent != theReceivingPlayer->edict()) && (ent->v.team != TEAM_IND) && (ent->v.team != TEAM_SPECT ))
|
if(( marineGlow || (ent->v.team == theReceivingPlayer->pev->team)) && (ent != theReceivingPlayer->edict()) && (ent->v.team != TEAM_IND) && (ent->v.team != TEAM_SPECT ) && (ent->v.classname != MAKE_STRING(kesTeamWebStrand)) )
|
||||||
{
|
{
|
||||||
state->rendermode = kRenderTransAdd;
|
state->rendermode = kRenderTransAdd;
|
||||||
state->renderamt = 150;
|
state->renderamt = 150;
|
||||||
|
|
|
@ -626,6 +626,7 @@ void AvHHive::SetInactive()
|
||||||
this->mSpawning = false;
|
this->mSpawning = false;
|
||||||
this->mSolid = false;
|
this->mSolid = false;
|
||||||
this->mTimeLastContributed = -1;
|
this->mTimeLastContributed = -1;
|
||||||
|
this->mTimeEmergencyUseEnabled=-1.0f;
|
||||||
this->mTechnology = MESSAGE_NULL;
|
this->mTechnology = MESSAGE_NULL;
|
||||||
|
|
||||||
this->pev->health = 0;
|
this->pev->health = 0;
|
||||||
|
|
Loading…
Reference in a new issue