mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 19:37:03 +00:00
Merge branch 'master' into 303
Conflicts: contrib/extractor/System.cpp contrib/extractor/ad.exe src/game/WorldSocket.cpp
This commit is contained in:
commit
78ec66babc
78 changed files with 510 additions and 752 deletions
|
|
@ -137,7 +137,7 @@ void Corpse::DeleteFromDB()
|
|||
CharacterDatabase.PExecute("DELETE FROM corpse WHERE player = '%d' AND corpse_type <> '0'", GUID_LOPART(GetOwnerGUID()));
|
||||
}
|
||||
|
||||
bool Corpse::LoadFromDB(uint32 guid, QueryResult *result, uint32 InstanceId)
|
||||
bool Corpse::LoadFromDB(uint32 guid, QueryResult *result)
|
||||
{
|
||||
bool external = (result != NULL);
|
||||
if (!external)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue