Core/Misc: fix typo - yet another English language lesson: INTERUPT -> INTERRUPT
This commit is contained in:
@@ -889,7 +889,7 @@ Player::~Player ()
|
|||||||
void Player::CleanupsBeforeDelete(bool finalCleanup)
|
void Player::CleanupsBeforeDelete(bool finalCleanup)
|
||||||
{
|
{
|
||||||
TradeCancel(false);
|
TradeCancel(false);
|
||||||
DuelComplete(DUEL_INTERUPTED);
|
DuelComplete(DUEL_INTERRUPTED);
|
||||||
|
|
||||||
Unit::CleanupsBeforeDelete(finalCleanup);
|
Unit::CleanupsBeforeDelete(finalCleanup);
|
||||||
|
|
||||||
@@ -7500,13 +7500,13 @@ void Player::DuelComplete(DuelCompleteType type)
|
|||||||
sLog->outDebug(LOG_FILTER_UNITS, "Duel Complete %s %s", GetName(), duel->opponent->GetName());
|
sLog->outDebug(LOG_FILTER_UNITS, "Duel Complete %s %s", GetName(), duel->opponent->GetName());
|
||||||
|
|
||||||
WorldPacket data(SMSG_DUEL_COMPLETE, (1));
|
WorldPacket data(SMSG_DUEL_COMPLETE, (1));
|
||||||
data << (uint8)((type != DUEL_INTERUPTED) ? 1 : 0);
|
data << (uint8)((type != DUEL_INTERRUPTED) ? 1 : 0);
|
||||||
GetSession()->SendPacket(&data);
|
GetSession()->SendPacket(&data);
|
||||||
|
|
||||||
if (duel->opponent->GetSession())
|
if (duel->opponent->GetSession())
|
||||||
duel->opponent->GetSession()->SendPacket(&data);
|
duel->opponent->GetSession()->SendPacket(&data);
|
||||||
|
|
||||||
if (type != DUEL_INTERUPTED)
|
if (type != DUEL_INTERRUPTED)
|
||||||
{
|
{
|
||||||
data.Initialize(SMSG_DUEL_WINNER, (1+20)); // we guess size
|
data.Initialize(SMSG_DUEL_WINNER, (1+20)); // we guess size
|
||||||
data << uint8(type == DUEL_WON ? 0 : 1); // 0 = just won; 1 = fled
|
data << uint8(type == DUEL_WON ? 0 : 1); // 0 = just won; 1 = fled
|
||||||
|
|||||||
@@ -732,7 +732,7 @@ enum RestType
|
|||||||
|
|
||||||
enum DuelCompleteType
|
enum DuelCompleteType
|
||||||
{
|
{
|
||||||
DUEL_INTERUPTED = 0,
|
DUEL_INTERRUPTED = 0,
|
||||||
DUEL_WON = 1,
|
DUEL_WON = 1,
|
||||||
DUEL_FLED = 2
|
DUEL_FLED = 2
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -15208,7 +15208,7 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
|
|||||||
{
|
{
|
||||||
pVictim->ToPlayer()->duel->opponent->CombatStopWithPets(true);
|
pVictim->ToPlayer()->duel->opponent->CombatStopWithPets(true);
|
||||||
pVictim->ToPlayer()->CombatStopWithPets(true);
|
pVictim->ToPlayer()->CombatStopWithPets(true);
|
||||||
pVictim->ToPlayer()->DuelComplete(DUEL_INTERUPTED);
|
pVictim->ToPlayer()->DuelComplete(DUEL_INTERRUPTED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // creature died
|
else // creature died
|
||||||
|
|||||||
@@ -78,5 +78,5 @@ void WorldSession::HandleDuelCancelledOpcode(WorldPacket& recvPacket)
|
|||||||
uint64 guid;
|
uint64 guid;
|
||||||
recvPacket >> guid;
|
recvPacket >> guid;
|
||||||
|
|
||||||
GetPlayer()->DuelComplete(DUEL_INTERUPTED);
|
GetPlayer()->DuelComplete(DUEL_INTERRUPTED);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user