aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/server/game/Entities/Player/Player.cpp6
-rwxr-xr-xsrc/server/game/Entities/Player/Player.h2
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.cpp2
-rwxr-xr-xsrc/server/game/Server/Protocol/Handlers/DuelHandler.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 51e418b9202..38669109d6e 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -889,7 +889,7 @@ Player::~Player ()
void Player::CleanupsBeforeDelete(bool finalCleanup)
{
TradeCancel(false);
- DuelComplete(DUEL_INTERUPTED);
+ DuelComplete(DUEL_INTERRUPTED);
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());
WorldPacket data(SMSG_DUEL_COMPLETE, (1));
- data << (uint8)((type != DUEL_INTERUPTED) ? 1 : 0);
+ data << (uint8)((type != DUEL_INTERRUPTED) ? 1 : 0);
GetSession()->SendPacket(&data);
if (duel->opponent->GetSession())
duel->opponent->GetSession()->SendPacket(&data);
- if (type != DUEL_INTERUPTED)
+ if (type != DUEL_INTERRUPTED)
{
data.Initialize(SMSG_DUEL_WINNER, (1+20)); // we guess size
data << uint8(type == DUEL_WON ? 0 : 1); // 0 = just won; 1 = fled
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index ee4ecc9fbcd..13e6b195142 100755
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -732,7 +732,7 @@ enum RestType
enum DuelCompleteType
{
- DUEL_INTERUPTED = 0,
+ DUEL_INTERRUPTED = 0,
DUEL_WON = 1,
DUEL_FLED = 2
};
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 4b0bafbad35..6a84acfa257 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -15208,7 +15208,7 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
{
pVictim->ToPlayer()->duel->opponent->CombatStopWithPets(true);
pVictim->ToPlayer()->CombatStopWithPets(true);
- pVictim->ToPlayer()->DuelComplete(DUEL_INTERUPTED);
+ pVictim->ToPlayer()->DuelComplete(DUEL_INTERRUPTED);
}
}
else // creature died
diff --git a/src/server/game/Server/Protocol/Handlers/DuelHandler.cpp b/src/server/game/Server/Protocol/Handlers/DuelHandler.cpp
index ded520d84f0..832ef42d322 100755
--- a/src/server/game/Server/Protocol/Handlers/DuelHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/DuelHandler.cpp
@@ -78,5 +78,5 @@ void WorldSession::HandleDuelCancelledOpcode(WorldPacket& recvPacket)
uint64 guid;
recvPacket >> guid;
- GetPlayer()->DuelComplete(DUEL_INTERUPTED);
+ GetPlayer()->DuelComplete(DUEL_INTERRUPTED);
}