fix

UnrealKaraulov · Nov 19, 2024 · 94f811d · 94f811d
1 parent ccd643b
commit 94f811d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -80,3 +80,4 @@ ascript/angelscript/projects/msvc2022/Debug/angelscript.vcxproj.FileListAbsolute
 /vs-project/glfw/src/ReleaseXPx86
 /vs-project/fmt/fmt.dir
 /vs-project/glfw/src/glfw.dir
+/ascript/angelscript/projects/msvc2022/x64
diff --git a/src/nav/LeafNavMesh.cpp b/src/nav/LeafNavMesh.cpp
@@ -168,7 +168,7 @@ int LeafNavMesh::getNodeIdx(Bsp* map, Entity* ent) {
 		boxPolys[i] = std::vector<vec3>{ face.v1.pos, face.v2.pos, face.v3.pos, face.v6.pos };
 	}
 
-	for (size_t i = 0; i < nodes.size(); i++) {
+	for (int i = 0; i < (int)nodes.size(); i++) {
 		LeafNode& mesh = nodes[i];
 
 		for (size_t k = 0; k < mesh.leafFaces.size(); k++) {

diff --git a/src/util/Polygon3D.cpp b/src/util/Polygon3D.cpp
@@ -200,7 +200,7 @@ std::vector<std::vector<vec3>> Polygon3D::cut(Line2D cutLine) {
 	std::vector<vec2> newLocalVerts;
 
 	for (size_t i = 0; i < localVerts.size(); i++) {
-		int next = (i + 1) % localVerts.size();
+		size_t next = (i + 1) % localVerts.size();
 		vec2 e1 = localVerts[i];
 		vec2 e2 = localVerts[next];
 		Line2D edge(e1, e2);
@@ -373,11 +373,11 @@ Polygon3D Polygon3D::merge(const Polygon3D& mergePoly) {
 	int sharedEdges = 0;
 	int commonEdgeStart1 = -1, commonEdgeEnd1 = -1;
 	int commonEdgeStart2 = -1, commonEdgeEnd2 = -1;
-	for (size_t i = 0; i < verts.size(); i++) {
+	for (int i = 0; i < (int)verts.size(); i++) {
 		const vec3& e1 = verts[i];
 		const vec3& e2 = verts[(i + 1) % verts.size()];
 
-		for (size_t k = 0; k < mergePoly.verts.size(); k++) {
+		for (int k = 0; k < (int)mergePoly.verts.size(); k++) {
 			const vec3& other1 = mergePoly.verts[k];
 			const vec3& other2 = mergePoly.verts[(k + 1) % mergePoly.verts.size()];
 

diff --git a/vs-project/bspguy.vcxproj b/vs-project/bspguy.vcxproj
@@ -185,7 +185,7 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);WIN32;_WINDOWS;GLEW_STATIC;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_ITERATOR_DEBUG_LEVEL=1</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);WIN32;_WINDOWS;GLEW_STATIC;NOMINMAX;_CRT_SECURE_NO_WARNINGS;</PreprocessorDefinitions>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
@@ -265,7 +265,7 @@ del "$(TargetDir)bspguy.cfg_bak"</Command>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);WIN32;_WINDOWS;GLEW_STATIC;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_ITERATOR_DEBUG_LEVEL=1</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);WIN32;_WINDOWS;GLEW_STATIC;NOMINMAX;_CRT_SECURE_NO_WARNINGS;</PreprocessorDefinitions>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

diff --git a/vs-project/fmt/fmt.vcxproj b/vs-project/fmt/fmt.vcxproj
@@ -159,7 +159,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <UseFullPaths>false</UseFullPaths>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);WIN32;_WINDOWS;GLEW_STATIC;NDEBUG;_ITERATOR_DEBUG_LEVEL=1</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);WIN32;_WINDOWS;GLEW_STATIC;NDEBUG;</PreprocessorDefinitions>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <OmitFramePointers>false</OmitFramePointers>
       <OpenMPSupport>true</OpenMPSupport>
@@ -196,7 +196,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <UseFullPaths>false</UseFullPaths>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);WIN32;_WINDOWS;GLEW_STATIC;NDEBUG;_ITERATOR_DEBUG_LEVEL=1</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);WIN32;_WINDOWS;GLEW_STATIC;NDEBUG;</PreprocessorDefinitions>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <OmitFramePointers>false</OmitFramePointers>
       <OpenMPSupport>true</OpenMPSupport>