diff options
| author | Shocker <shocker@freakz.ro> | 2011-04-29 22:24:26 +0300 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2011-04-29 22:24:26 +0300 |
| commit | 0fb8f057974cdf3107084be65005956efb5191dc (patch) | |
| tree | 8fe211ecee643625c01ec3970038e345ec44c5f0 /src/server/collision/Maps/TileAssembler.cpp | |
| parent | f96e1ce1d7b10074750da761ff9b219a24d0f09f (diff) | |
| parent | 1b1d7507f1c3ea768f3fdaf4e1729b66fe590a68 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Diffstat (limited to 'src/server/collision/Maps/TileAssembler.cpp')
| -rw-r--r-- | src/server/collision/Maps/TileAssembler.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp index 324294ae9f3..d2bbe851af0 100644 --- a/src/server/collision/Maps/TileAssembler.cpp +++ b/src/server/collision/Maps/TileAssembler.cpp @@ -262,12 +262,12 @@ 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); @@ -362,8 +362,8 @@ namespace VMAP if (!rf) { - printf("ERROR: Can't open model file in form: %s",pModelFilename.c_str()); - printf("... or form: %s",filename.c_str() ); + printf("ERROR: Can't open model file in form: %s", pModelFilename.c_str()); + printf("... or form: %s", filename.c_str() ); return false; } @@ -372,11 +372,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); |