Fix compass arrows not below objective (fixes #836)

Also fix static missions with 0 exits
cxong · Mar 26, 2024 · 315c2ca · 315c2ca
1 parent 7857576
commit 315c2ca
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -122,7 +122,7 @@ jobs:
     - name: Download DLLs on tags (Windows)
       if: startsWith(github.ref, 'refs/tags/') && matrix.os == 'windows-latest'
       run: |
-        build/windows/get-sdl2-dlls.bat dll
+        build/windows/get-sdl2-dlls.bat dll 64
 
     - name: Make package on tags
       if: startsWith(github.ref, 'refs/tags/')

diff --git a/appveyor.yml b/appveyor.yml
@@ -32,7 +32,7 @@ install:
   - cd %APPVEYOR_BUILD_FOLDER%
 
 before_build:
-  - .\build\windows\get-sdl2-dlls.bat dll "appveyor DownloadFile"
+  - .\build\windows\get-sdl2-dlls.bat dll 32 "appveyor DownloadFile"
   - cmake -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -G "Visual Studio 17 2022" -A Win32 .
 
 build:

diff --git a/appveyor.yml.cmake b/appveyor.yml.cmake
@@ -32,7 +32,7 @@ install:
   - cd %APPVEYOR_BUILD_FOLDER%
 
 before_build:
-  - .\build\windows\get-sdl2-dlls.bat dll "appveyor DownloadFile"
+  - .\build\windows\get-sdl2-dlls.bat dll 32 "appveyor DownloadFile"
   - cmake -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -G "Visual Studio 17 2022" -A Win32 .
 
 build:

diff --git a/src/cdogs/hud/player_hud.c b/src/cdogs/hud/player_hud.c
@@ -801,9 +801,9 @@ static void DrawCompassArrow(
 	const struct vec2 compassV = svec2_subtract(
 		pos,
 		// Offset a little so the arrow points exactly at center of objective
-		svec2(playerPos.x - TILE_WIDTH / 2, playerPos.y - 20));
+		svec2(playerPos.x - TILE_WIDTH / 2, playerPos.y));
 	// Don't draw if objective is on screen
-	if (fabsf(compassV.x) < r.Size.x / 2 && fabsf(compassV.y) < r.Size.y / 2)
+	if (fabsf(compassV.x) < r.Size.x && fabsf(compassV.y) < r.Size.y)
 	{
 		return;
 	}

diff --git a/src/cdogs/mission_static.c b/src/cdogs/mission_static.c
@@ -552,6 +552,11 @@ static void LoadStaticExit(
 	struct vec2i end;
 	LoadVec2i(&end, exitNode, "End");
 	exit.R.Size = svec2i_subtract(end, exit.R.Pos);
+	// Ignore empty exits
+	if (svec2i_is_zero(exit.R.Size))
+	{
+		return;
+	}
 	exit.Mission = mission + 1;
 	CArrayPushBack(&m->Exits, &exit);
 }