diff options
| author | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
|---|---|---|
| committer | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
| commit | 42d1562183dd0598de155e30264393edc6925a21 (patch) | |
| tree | 73263639af50fcf177ff9bdf3791d8fc5afce454 /src/server/collision/Maps/TileAssembler.cpp | |
| parent | 7f4be7e93a03c2f4c964590efb166c7dadcb6837 (diff) | |
| parent | 7f89678bcda1b58ff0701c0915074e81a9caf720 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore.git
Conflicts:
src/server/game/Entities/Player/Player.cpp
Diffstat (limited to 'src/server/collision/Maps/TileAssembler.cpp')
| -rw-r--r-- | src/server/collision/Maps/TileAssembler.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp index bfbbef3d915..594e1a9382b 100644 --- a/src/server/collision/Maps/TileAssembler.cpp +++ b/src/server/collision/Maps/TileAssembler.cpp @@ -265,13 +265,13 @@ namespace VMAP int readOperation = 1; // temporary use defines to simplify read/check code (close file and return at fail) - #define READ_OR_RETURN(V, S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN(V, S) if (fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++; // only use this for array deletes - #define READ_OR_RETURN_WITH_DELETE(V, S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN_WITH_DELETE(V, S) if (fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); delete[] V; return(false); }readOperation++; - #define CMP_OR_RETURN(V, S) if(strcmp((V), (S)) != 0) { \ + #define CMP_OR_RETURN(V, S) if (strcmp((V), (S)) != 0) { \ fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } READ_OR_RETURN(&ident, 8); @@ -377,11 +377,11 @@ namespace VMAP int readOperation = 1; // temporary use defines to simplify read/check code (close file and return at fail) - #define READ_OR_RETURN(V, S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN(V, S) if (fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++; - #define READ_OR_RETURN_WITH_DELETE(V, S) if(fread((V), (S), 1, rf) != 1) { \ + #define READ_OR_RETURN_WITH_DELETE(V, S) if (fread((V), (S), 1, rf) != 1) { \ fclose(rf); printf("readfail, op = %i\n", readOperation); delete[] V; return(false); }readOperation++; - #define CMP_OR_RETURN(V, S) if(strcmp((V), (S)) != 0) { \ + #define CMP_OR_RETURN(V, S) if (strcmp((V), (S)) != 0) { \ fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } READ_OR_RETURN(&ident, 8); |