diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-09-28 17:20:27 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-09-29 18:45:01 +0200 |
| commit | 402a3c45ffe65597d9863dce5fb76362795d706a (patch) | |
| tree | 2820239fa3e7c535306c2aa9f544b2ca13607126 /src/server/database/Database/Implementation | |
| parent | 70a5cdfc04f510d39af5ea050757f33804ae7723 (diff) | |
Core/Maps: Moved corpse management to map level
(cherry picked from commit cd27fd38b93884797c094a82dc7beb0498e2f124)
# Conflicts:
# src/server/database/Database/Implementation/CharacterDatabase.cpp
# src/server/database/Database/Implementation/CharacterDatabase.h
# src/server/game/Entities/Corpse/Corpse.cpp
# src/server/game/Entities/Creature/GossipDef.cpp
# src/server/game/Entities/Player/Player.cpp
# src/server/game/Entities/Player/Player.h
# src/server/game/Globals/ObjectAccessor.cpp
# src/server/game/Globals/ObjectAccessor.h
# src/server/game/Globals/ObjectMgr.cpp
# src/server/game/Globals/ObjectMgr.h
# src/server/game/Grids/ObjectGridLoader.cpp
# src/server/game/Handlers/AuctionHouseHandler.cpp
# src/server/game/Handlers/CharacterHandler.cpp
# src/server/game/Handlers/ChatHandler.cpp
# src/server/game/Handlers/QueryHandler.cpp
# src/server/game/Maps/Map.cpp
# src/server/game/Server/Packets/CharacterPackets.cpp
# src/server/game/World/World.cpp
# src/server/scripts/Commands/cs_reload.cpp
Diffstat (limited to 'src/server/database/Database/Implementation')
| -rw-r--r-- | src/server/database/Database/Implementation/CharacterDatabase.cpp | 1 | ||||
| -rw-r--r-- | src/server/database/Database/Implementation/CharacterDatabase.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/server/database/Database/Implementation/CharacterDatabase.cpp b/src/server/database/Database/Implementation/CharacterDatabase.cpp index cc5b3771e1e..b5b79a3e11d 100644 --- a/src/server/database/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/database/Database/Implementation/CharacterDatabase.cpp @@ -320,6 +320,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() PrepareStatement(CHAR_INS_CORPSE, "INSERT INTO corpse (guid, posX, posY, posZ, orientation, mapId, displayId, itemCache, bytes1, bytes2, guildId, flags, dynFlags, time, corpseType, instanceId, phaseMask) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC); PrepareStatement(CHAR_DEL_CORPSE, "DELETE FROM corpse WHERE guid = ?", CONNECTION_ASYNC); PrepareStatement(CHAR_DEL_CORPSES_FROM_MAP, "DELETE FROM corpse WHERE mapId = ? AND instanceId = ?", CONNECTION_ASYNC); + PrepareStatement(CHAR_SEL_CORPSE_LOCATION, "SELECT mapId, posX, posY, posZ, orientation FROM corpse WHERE guid = ?", CONNECTION_ASYNC); // Creature respawn PrepareStatement(CHAR_SEL_CREATURE_RESPAWNS, "SELECT guid, respawnTime FROM creature_respawn WHERE mapId = ? AND instanceId = ?", CONNECTION_SYNCH); diff --git a/src/server/database/Database/Implementation/CharacterDatabase.h b/src/server/database/Database/Implementation/CharacterDatabase.h index 5ebafe0d0f8..c76c584a0a8 100644 --- a/src/server/database/Database/Implementation/CharacterDatabase.h +++ b/src/server/database/Database/Implementation/CharacterDatabase.h @@ -269,6 +269,7 @@ enum CharacterDatabaseStatements CHAR_INS_CORPSE, CHAR_DEL_CORPSE, CHAR_DEL_CORPSES_FROM_MAP, + CHAR_SEL_CORPSE_LOCATION, CHAR_SEL_CREATURE_RESPAWNS, CHAR_REP_CREATURE_RESPAWN, |