diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/Collision/DynamicTree.cpp | 2 | ||||
| -rw-r--r-- | src/common/Collision/Maps/TileAssembler.cpp | 4 | ||||
| -rw-r--r-- | src/common/Collision/Models/ModelInstance.cpp | 1 | ||||
| -rw-r--r-- | src/common/Dynamic/TypeContainerFunctions.h | 2 | ||||
| -rw-r--r-- | src/common/Dynamic/TypeContainerFunctionsPtr.h | 3 | ||||
| -rw-r--r-- | src/common/Platform/ServiceWin32.cpp | 6 | ||||
| -rw-r--r-- | src/common/Utilities/Util.cpp | 2 |
7 files changed, 9 insertions, 11 deletions
diff --git a/src/common/Collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp index aef80fa914..4fcfc55b49 100644 --- a/src/common/Collision/DynamicTree.cpp +++ b/src/common/Collision/DynamicTree.cpp @@ -279,7 +279,7 @@ bool DynamicMapTree::isInLineOfSight(float x1, float y1, float z1, float x2, flo float maxDist = (v2 - v1).magnitude(); - if (!G3D::fuzzyGt(maxDist, 0) ) + if (!G3D::fuzzyGt(maxDist, 0)) { return true; } diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp index b86d83419b..50cf2eaca0 100644 --- a/src/common/Collision/Maps/TileAssembler.cpp +++ b/src/common/Collision/Maps/TileAssembler.cpp @@ -418,7 +418,7 @@ namespace VMAP std::string model_name(buff, name_length); WorldModel_Raw raw_model; - if ( !raw_model.Read((iSrcDir + "/" + model_name).c_str()) ) + if (!raw_model.Read((iSrcDir + "/" + model_name).c_str())) { continue; } @@ -527,7 +527,7 @@ namespace VMAP READ_OR_RETURN_WITH_DELETE(vectorarray, nvectors * sizeof(float) * 3); for (uint32 i = 0; i < nvectors; ++i) { - vertexArray.push_back( Vector3(vectorarray + 3 * i) ); + vertexArray.push_back( Vector3(vectorarray + 3 * i)); } delete[] vectorarray; diff --git a/src/common/Collision/Models/ModelInstance.cpp b/src/common/Collision/Models/ModelInstance.cpp index 4510461bdd..4a540a7857 100644 --- a/src/common/Collision/Models/ModelInstance.cpp +++ b/src/common/Collision/Models/ModelInstance.cpp @@ -227,5 +227,4 @@ namespace VMAP if (check != nameLen) { return false; } return true; } - } diff --git a/src/common/Dynamic/TypeContainerFunctions.h b/src/common/Dynamic/TypeContainerFunctions.h index 12094a4909..b517f4529a 100644 --- a/src/common/Dynamic/TypeContainerFunctions.h +++ b/src/common/Dynamic/TypeContainerFunctions.h @@ -237,7 +237,7 @@ namespace Acore //{ // // The head element is bad // SPECIFIC_TYPE* t = Remove(elements._elements, obj); - // return ( t != nullptr ? t : Remove(elements._TailElements, obj) ); + // return ( t != nullptr ? t : Remove(elements._TailElements, obj)); //} } #endif diff --git a/src/common/Dynamic/TypeContainerFunctionsPtr.h b/src/common/Dynamic/TypeContainerFunctionsPtr.h index 37be105cee..7b17b4c388 100644 --- a/src/common/Dynamic/TypeContainerFunctionsPtr.h +++ b/src/common/Dynamic/TypeContainerFunctionsPtr.h @@ -137,7 +137,7 @@ namespace Acore template<class SPECIFIC_TYPE> bool Remove(ContainerMapList<SPECIFIC_TYPE>& elements, CountedPtr<SPECIFIC_TYPE>& obj, OBJECT_HANDLE hdl) { typename std::map<OBJECT_HANDLE, CountedPtr<SPECIFIC_TYPE>>::iterator iter = elements._element.find(hdl); - if ( iter != elements._element.end() ) + if (iter != elements._element.end()) { elements._element.erase(iter); return true; @@ -163,6 +163,5 @@ namespace Acore bool t = Remove(elements._elements, obj, hdl); return ( !t ? Remove(elements._TailElements, obj, hdl) : t ); } - } #endif diff --git a/src/common/Platform/ServiceWin32.cpp b/src/common/Platform/ServiceWin32.cpp index 7ff540ba88..b0104e43bb 100644 --- a/src/common/Platform/ServiceWin32.cpp +++ b/src/common/Platform/ServiceWin32.cpp @@ -52,7 +52,7 @@ bool WinServiceInstall() if (serviceControlMgr) { char path[_MAX_PATH + 10]; - if (GetModuleFileName( 0, path, sizeof(path) / sizeof(path[0]) ) > 0) + if (GetModuleFileName( 0, path, sizeof(path) / sizeof(path[0])) > 0) { SC_HANDLE service; std::strcat(path, " --service"); @@ -170,7 +170,7 @@ void WINAPI ServiceControlHandler(DWORD controlCode) break; default: - if ( controlCode >= 128 && controlCode <= 255 ) + if (controlCode >= 128 && controlCode <= 255) // user defined control code { break; @@ -198,7 +198,7 @@ void WINAPI ServiceMain(DWORD argc, char* argv[]) serviceStatusHandle = RegisterServiceCtrlHandler(serviceName, ServiceControlHandler); - if ( serviceStatusHandle ) + if (serviceStatusHandle) { char path[_MAX_PATH + 1]; unsigned int i, last_slash = 0; diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp index 0652e56673..56cc75e166 100644 --- a/src/common/Utilities/Util.cpp +++ b/src/common/Utilities/Util.cpp @@ -90,7 +90,7 @@ std::string secsToTimeString(uint64 timeInSecs, bool shortText) { ss << minutes << (shortText ? "m" : " minute(s) "); } - if (secs || (!days && !hours && !minutes) ) + if (secs || (!days && !hours && !minutes)) { ss << secs << (shortText ? "s" : " second(s) "); } |