[8615] fixed wrong assert in av-code

when alliance captured snowfall and horde assaulted
this grave while assault in progress crashes could happen
This commit is contained in:
balrok 2009-10-10 10:07:32 +02:00
parent 17b0c43ea9
commit 29e6601335
2 changed files with 3 additions and 2 deletions

View file

@ -737,7 +737,8 @@ void BattleGroundAV::AssaultNode(BG_AV_Nodes node, uint32 team)
assert(team < 3); // alliance:0, horde:1, neutral:2
assert(m_Nodes[node].TotalOwner != team);
assert(m_Nodes[node].Owner != team);
assert(m_Nodes[node].State != POINT_ASSAULTED || !m_Nodes[node].TotalOwner ); // only assault an assaulted node if no totalowner exists
// only assault an assaulted node if no totalowner exists:
assert(m_Nodes[node].State != POINT_ASSAULTED || m_Nodes[node].TotalOwner == BG_AV_NEUTRAL_TEAM);
// the timer gets another time, if the previous owner was 0 == Neutral
m_Nodes[node].Timer = (m_Nodes[node].PrevOwner != BG_AV_NEUTRAL_TEAM) ? BG_AV_CAPTIME : BG_AV_SNOWFALL_FIRSTCAP;
m_Nodes[node].PrevOwner = m_Nodes[node].Owner;

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "8614"
#define REVISION_NR "8615"
#endif // __REVISION_NR_H__