diff options
author | wowpsp <a@wowpsp.com> | 2013-05-19 04:31:56 -0700 |
---|---|---|
committer | wowpsp <a@wowpsp.com> | 2013-05-19 04:31:56 -0700 |
commit | 897d5dadff6206eaa37ec01e70e6ad5249b9a65e (patch) | |
tree | 54d4c930291bd18e0cc03ac255d671d07cd71f05 /src/server/collision/Maps/TileAssembler.cpp | |
parent | 529e8fba8242e4eb1cf1d90049a0f71068c72b30 (diff) | |
parent | 695c8cd7b4e221b20a273c34001d737c2bc5765f (diff) |
Merge pull request #1 from TrinityCore/master
Diffstat (limited to 'src/server/collision/Maps/TileAssembler.cpp')
-rw-r--r-- | src/server/collision/Maps/TileAssembler.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp index 8cd6d92beb2..aca7c02e79f 100644 --- a/src/server/collision/Maps/TileAssembler.cpp +++ b/src/server/collision/Maps/TileAssembler.cpp @@ -498,10 +498,9 @@ namespace VMAP } char ident[8]; - ident[7] = 0; int readOperation = 0; - - READ_OR_RETURN(&ident, 7); + + READ_OR_RETURN(&ident, 8); CMP_OR_RETURN(ident, RAW_VMAP_MAGIC); // we have to read one int. This is needed during the export and we have to skip it here @@ -517,7 +516,7 @@ namespace VMAP for (uint32 g = 0; g < groups && succeed; ++g) succeed = groupsArray[g].Read(rf); - if (!succeed) /// rf will be freed inside Read if the function had any errors. + if (succeed) /// rf will be freed inside Read if the function had any errors. fclose(rf); return succeed; } |