diff options
| author | Spp <spp@jorge.gr> | 2011-09-29 12:43:05 +0200 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2011-09-29 12:43:05 +0200 |
| commit | b16d2245bbd374805d15cdca585e8b42bf139605 (patch) | |
| tree | b7b63c567112e1999a2566611363cf5e83adb1be /src/server/collision/Models | |
| parent | 8b820baa7324d41df264f48e344d62584bff70f8 (diff) | |
Cosmetic: Multiple cosmetic changes
- Added missing space to 'if', 'for', 'while' and 'switch' when it's followed by '('
- Added missing space after a comma and remove space before comma (with some exceptions)
- Remove trailing spaces
- Convert tab to spaces
Note: Only affects files with extension "cpp" and "h" under /src/server
Diffstat (limited to 'src/server/collision/Models')
| -rw-r--r-- | src/server/collision/Models/ModelInstance.cpp | 2 | ||||
| -rw-r--r-- | src/server/collision/Models/WorldModel.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/collision/Models/ModelInstance.cpp b/src/server/collision/Models/ModelInstance.cpp index a86f6cac45a..f0bff0cef73 100644 --- a/src/server/collision/Models/ModelInstance.cpp +++ b/src/server/collision/Models/ModelInstance.cpp @@ -57,7 +57,7 @@ namespace VMAP Ray modRay(p, iInvRot * pRay.direction()); float distance = pMaxDist * iInvScale; bool hit = iModel->IntersectRay(modRay, distance, pStopAtFirstHit); - if(hit) + if (hit) { distance *= iScale; pMaxDist = distance; diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp index 3dad4a10174..da75492c9c6 100644 --- a/src/server/collision/Models/WorldModel.cpp +++ b/src/server/collision/Models/WorldModel.cpp @@ -161,7 +161,7 @@ namespace VMAP if ((iFlags[tx + ty*iTilesX] & 0x0F) == 0x0F) return false; - // (dx, dy) coordinates inside tile, in [0,1]^2 + // (dx, dy) coordinates inside tile, in [0, 1]^2 float dx = tx_f - (float)tx; float dy = ty_f - (float)ty; @@ -169,7 +169,7 @@ namespace VMAP ^ dy | - 1 x---------x (1,1) + 1 x---------x (1, 1) | (b) / | | / | | / | @@ -442,7 +442,7 @@ namespace VMAP { float group_Z; //float pVol = prims[entry].GetBound().volume(); - //if(pVol < minVol) + //if (pVol < minVol) //{ /* if (prims[entry].iBound.contains(point)) */ if (prims[entry].IsInsideObject(point, zVec, group_Z)) |
