diff options
| author | leak <leakzx@googlemail.com> | 2011-04-29 20:47:02 +0200 |
|---|---|---|
| committer | leak <leakzx@googlemail.com> | 2011-04-29 20:47:02 +0200 |
| commit | 1003f30448f1f431ef091551ba5851cf7cd2b31a (patch) | |
| tree | 9bebedb5b8bd6b4d6cf6d9daa83df90a86b1a786 /src/server/collision/Maps | |
| parent | 01a79947d56eae6ed9f47dc2b41897d77cc91f41 (diff) | |
Add spaces after commas
Diffstat (limited to 'src/server/collision/Maps')
| -rw-r--r-- | src/server/collision/Maps/MapTree.cpp | 6 | ||||
| -rw-r--r-- | src/server/collision/Maps/TileAssembler.cpp | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp index cd4c74d2ead..632b4138c85 100644 --- a/src/server/collision/Maps/MapTree.cpp +++ b/src/server/collision/Maps/MapTree.cpp @@ -226,7 +226,7 @@ namespace VMAP float StaticMapTree::getHeight(const Vector3& pPos, float maxSearchDist) const { float height = G3D::inf(); - Vector3 dir = Vector3(0,0,-1); + Vector3 dir = Vector3(0, 0, -1); G3D::Ray ray(pPos, dir); // direction with length of 1 float maxDist = maxSearchDist; if (getIntersectionTime(ray, maxDist, false)) @@ -356,7 +356,7 @@ namespace VMAP } if (!iTreeValues) { - sLog->outError("StaticMapTree::LoadMapTile() : tree has not been initialized [%u,%u]", tileX, tileY); + sLog->outError("StaticMapTree::LoadMapTile() : tree has not been initialized [%u, %u]", tileX, tileY); return false; } bool result = true; @@ -382,7 +382,7 @@ namespace VMAP // acquire model instance WorldModel *model = vm->acquireModelInstance(iBasePath, spawn.name); if (!model) - sLog->outError("StaticMapTree::LoadMapTile() : could not acquire WorldModel pointer [%u,%u]", tileX, tileY); + sLog->outError("StaticMapTree::LoadMapTile() : could not acquire WorldModel pointer [%u, %u]", tileX, tileY); // update tree uint32 referencedVal; 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); |
