aboutsummaryrefslogtreecommitdiff
path: root/src/game/NPCHandler.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-04-11 14:47:38 -0500
committermegamage <none@none>2009-04-11 14:47:38 -0500
commit3120221deb93af2125a9baefe745cbbab8426ffe (patch)
tree6ebfc7364a8fc73eb234074d33477fbfe3fe08b6 /src/game/NPCHandler.cpp
parentf4d69d1b3b8fe6d26195b14f0ec2133b872c735c (diff)
*Note: this patch may do not have any use for TC.
[7645] Fixed problems wit temporary unsummoned pets and cleanup code. Author: VladimirMangos * Save temporary unsummoned pet to current slot (instead non_in_slot mode) and prevent save as current pet summoned while temporay unsummon (arena) * Prevent overwrite temporary summoned pet data * At player loading set temporary unsummoned pet data instead pet loading if pet expected to be temporary unsummoned in current player state (loading in taxi flight/etc) * Restore proper pet at arena leave and unsummon in arena summoned. --HG-- branch : trunk
Diffstat (limited to 'src/game/NPCHandler.cpp')
-rw-r--r--src/game/NPCHandler.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp
index 94a8c03ab24..8d1427c86b8 100644
--- a/src/game/NPCHandler.cpp
+++ b/src/game/NPCHandler.cpp
@@ -611,12 +611,13 @@ void WorldSession::HandleStablePet( WorldPacket & recv_data )
// slots ordered in query, and if not equal then free
if(slot!=free_slot)
break;
-
+
// this slot not free, skip
++free_slot;
}while( result->NextRow() );
+
+ delete result;
}
- delete result;
if( free_slot > 0 && free_slot <= GetPlayer()->m_stableSlots)
{