aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Tools/PlayerDump.cpp
diff options
context:
space:
mode:
authorSubv <s.v.h21@hotmail.com>2012-12-23 08:33:13 -0500
committerSubv <s.v.h21@hotmail.com>2012-12-23 08:33:13 -0500
commit3869bb7b3a96751b463ecec2d9ac663b792a0703 (patch)
tree330d7e96fa4021f6301d488d64ac6eed717172ab /src/server/game/Tools/PlayerDump.cpp
parentd40cbe0113329de96723e8fe015651c919760a15 (diff)
parent143340b38c857b2cc50ee9f8577abf9248b6317a (diff)
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Entities/Item/Item.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h
Diffstat (limited to 'src/server/game/Tools/PlayerDump.cpp')
-rw-r--r--src/server/game/Tools/PlayerDump.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp
index 7e3ac8b319d..a8ed3207db5 100644
--- a/src/server/game/Tools/PlayerDump.cpp
+++ b/src/server/game/Tools/PlayerDump.cpp
@@ -411,7 +411,6 @@ DumpReturn PlayerDumpReader::LoadDump(std::string const& file, uint32 account, s
if (!fin)
return DUMP_FILE_OPEN_ERROR;
- QueryResult result = QueryResult(NULL);
char newguid[20], chraccount[20], newpetid[20], currpetid[20], lastpetid[20];
// make sure the same guid doesn't already exist and is safe to use