diff options
author | maximius <none@none> | 2009-10-17 15:35:07 -0700 |
---|---|---|
committer | maximius <none@none> | 2009-10-17 15:35:07 -0700 |
commit | 26b5e033ffde3d161382fc9addbfa99738379641 (patch) | |
tree | a344f369ca32945f787a02dee35c3dbe342bed7e /src/game/DuelHandler.cpp | |
parent | f21f47005dcb6b76e1abc9f35fbcd03eed191bff (diff) |
*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)
*Fix a possible crash in Spell::DoAllEffectOnTarget
--HG--
branch : trunk
Diffstat (limited to 'src/game/DuelHandler.cpp')
-rw-r--r-- | src/game/DuelHandler.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/game/DuelHandler.cpp b/src/game/DuelHandler.cpp index c35b9dbdc07..64ec8f6352b 100644 --- a/src/game/DuelHandler.cpp +++ b/src/game/DuelHandler.cpp @@ -17,7 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #include "Common.h" #include "WorldPacket.h" #include "WorldSession.h" @@ -25,63 +24,49 @@ #include "Opcodes.h" #include "UpdateData.h" #include "Player.h" - void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket) { uint64 guid; Player *pl; Player *plTarget; - if(!GetPlayer()->duel) // ignore accept from duel-sender return; - recvPacket >> guid; - pl = GetPlayer(); plTarget = pl->duel->opponent; - if(pl == pl->duel->initiator || !plTarget || pl == plTarget || pl->duel->startTime != 0 || plTarget->duel->startTime != 0) return; - //sLog.outDebug( "WORLD: received CMSG_DUEL_ACCEPTED" ); DEBUG_LOG("Player 1 is: %u (%s)", pl->GetGUIDLow(),pl->GetName()); DEBUG_LOG("Player 2 is: %u (%s)", plTarget->GetGUIDLow(),plTarget->GetName()); - time_t now = time(NULL); pl->duel->startTimer = now; plTarget->duel->startTimer = now; - WorldPacket data(SMSG_DUEL_COUNTDOWN, 4); data << (uint32)3000; // 3 seconds pl->GetSession()->SendPacket(&data); plTarget->GetSession()->SendPacket(&data); } - void WorldSession::HandleDuelCancelledOpcode(WorldPacket& recvPacket) { //sLog.outDebug( "WORLD: received CMSG_DUEL_CANCELLED" ); - // no duel requested if(!GetPlayer()->duel) return; - // player surrendered in a duel using /forfeit if(GetPlayer()->duel->startTime != 0) { GetPlayer()->CombatStopWithPets(true); if(GetPlayer()->duel->opponent) GetPlayer()->duel->opponent->CombatStopWithPets(true); - GetPlayer()->CastSpell(GetPlayer(), SPELL_ID_DUEL_BEG, true); // beg GetPlayer()->DuelComplete(DUEL_WON); return; } - // player either discarded the duel using the "discard button" // or used "/forfeit" before countdown reached 0 uint64 guid; recvPacket >> guid; - GetPlayer()->DuelComplete(DUEL_INTERUPTED); } |