diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp b/src/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp index 99f1abb02..7e4256124 100644 --- a/src/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp +++ b/src/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp @@ -907,13 +907,6 @@ bool VertexSorterX ( Vector const & A, Vector const & B ) void BuildConvexHull ( VertexList const & verts, VertexList & outPoly ) { - VertexList sortedVerts = verts; - - std::sort(sortedVerts.begin(),sortedVerts.end(),VertexSorterX); - - int count = verts.size(); - - //BuildConvexHull( sortedVerts.begin(), count, outPoly ); } // ---------------------------------------------------------------------- diff --git a/src/engine/shared/library/sharedFoundation/src/shared/Misc.h b/src/engine/shared/library/sharedFoundation/src/shared/Misc.h index 326d33419..2a32c7a4e 100644 --- a/src/engine/shared/library/sharedFoundation/src/shared/Misc.h +++ b/src/engine/shared/library/sharedFoundation/src/shared/Misc.h @@ -146,7 +146,7 @@ inline char *DuplicateString(const char *source) if (!source) return NULL; - const uint length = strlen(source)+1; + const size_t length = strlen(source)+1; char *result = NON_NULL (new char[length]); memcpy(result, source, length); return result; @@ -171,10 +171,10 @@ inline char *DuplicateStringWithToLower(const char *source) if (!source) return NULL; - const uint length = strlen(source)+1; + const size_t length = strlen(source)+1; char *result = NON_NULL (new char[length]); - for (uint i = 0; i < length; ++i) + for (size_t i = 0; i < length; ++i) result[i] = static_cast(tolower(source[i])); return result; diff --git a/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj b/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj index 8e6fe38ef..555b44099 100644 --- a/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj +++ b/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj @@ -59,7 +59,7 @@ .\..\..\..\..\..\..\compile\win32\dpvs\Release\ - .\release\ + .\..\..\..\..\..\..\compile\win32\dpvs\Release\ false diff --git a/src/external/3rd/library/stlport453/stlport/stl/_alloc.h b/src/external/3rd/library/stlport453/stlport/stl/_alloc.h index f14a89880..1c99a3ba8 100644 --- a/src/external/3rd/library/stlport453/stlport/stl/_alloc.h +++ b/src/external/3rd/library/stlport453/stlport/stl/_alloc.h @@ -164,11 +164,11 @@ private: // that this must be large enough to preserve // alignment. static size_t _STLP_CALL __extra_before_chunk() { - return (long)__extra_before/sizeof(value_type)+ + return (size_t)((long)__extra_before/sizeof(value_type))+ (size_t)((long)__extra_before%sizeof(value_type)>0); } static size_t _STLP_CALL __extra_after_chunk() { - return (long)__extra_after/sizeof(value_type)+ + return (size_t)((long)__extra_after/sizeof(value_type))+ (size_t)((long)__extra_after%sizeof(value_type)>0); } public: diff --git a/src/external/3rd/library/stlport453/stlport/stl/_string.c b/src/external/3rd/library/stlport453/stlport/stl/_string.c index 01d465eb4..0b623c6ee 100644 --- a/src/external/3rd/library/stlport453/stlport/stl/_string.c +++ b/src/external/3rd/library/stlport453/stlport/stl/_string.c @@ -337,7 +337,7 @@ template __size_type__ basic_string<_CharT,_Traits,_Alloc> ::find(const _CharT* __s, size_type __pos, size_type __n) const { if (__pos + __n > size()) - return npos; + return (size_t) npos; else { const const_pointer __result = _STLP_STD::search((const _CharT*)this->_M_start + __pos, (const _CharT*)this->_M_finish, diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiWebBrowserWidget.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiWebBrowserWidget.cpp index f6f2e35b2..2bfba2006 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiWebBrowserWidget.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiWebBrowserWidget.cpp @@ -36,7 +36,7 @@ namespace browserNamespace { - std::string s_homePage = "www.StarWarsGalaxies.com"; + std::string s_homePage = "beta.stellabellum.net"; } using namespace browserNamespace;