Update Blasphemer status bar extenders/CI stuff

edge-classic · Aug 28, 2024 · b6efe27 · b6efe27
1 parent e886703
commit b6efe27
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/cmake-release.yml b/.github/workflows/cmake-release.yml
@@ -45,13 +45,13 @@ jobs:
       - name: Extract w64devkit
         run: expand-archive -path ${{github.workspace}}\w64devkit.zip -destinationpath ${{github.workspace}}
       - name: Download SDL2-devel
-        run: invoke-webrequest https://github.com/libsdl-org/SDL/releases/download/release-2.30.3/SDL2-devel-2.30.3-mingw.zip -outfile ${{github.workspace}}\sdl2-devel.zip
+        run: invoke-webrequest https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-devel-2.30.6-mingw.zip -outfile ${{github.workspace}}\sdl2-devel.zip
       - name: Extract SDL2-devel
         run: expand-archive -path ${{github.workspace}}\sdl2-devel.zip -destinationpath ${{github.workspace}}
       - name: Copy SDL2-devel contents to w64devkit
         run: |
-          robocopy ${{github.workspace}}\SDL2-2.30.3\i686-w64-mingw32 ${{github.workspace}}\w64devkit\i686-w64-mingw32 /s ; if ($lastexitcode -lt 8) { $global:LASTEXITCODE = $null }
-          robocopy ${{github.workspace}}\SDL2-2.30.3\i686-w64-mingw32 ${{github.workspace}}\w64devkit /s ; if ($lastexitcode -lt 8) { $global:LASTEXITCODE = $null }
+          robocopy ${{github.workspace}}\SDL2-2.30.6\i686-w64-mingw32 ${{github.workspace}}\w64devkit\i686-w64-mingw32 /s ; if ($lastexitcode -lt 8) { $global:LASTEXITCODE = $null }
+          robocopy ${{github.workspace}}\SDL2-2.30.6\i686-w64-mingw32 ${{github.workspace}}\w64devkit /s ; if ($lastexitcode -lt 8) { $global:LASTEXITCODE = $null }
       - name: Set environment variables and build
         run: |
           $env:Path = "${{github.workspace}}\w64devkit\bin;" + $env:Path
@@ -60,7 +60,7 @@ jobs:
           cmake --build build --config ${{env.BUILD_TYPE}}
           strip ${{github.workspace}}\edge-classic.exe
       - name: Copy SDL2 DLL
-        run: copy-item -path ${{github.workspace}}\SDL2-2.30.3\i686-w64-mingw32\bin\SDL2.dll -destination ${{github.workspace}}
+        run: copy-item -path ${{github.workspace}}\SDL2-2.30.6\i686-w64-mingw32\bin\SDL2.dll -destination ${{github.workspace}}
       - uses: actions/upload-artifact@v4
         with:
           name: edge-classic-mingw

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -58,21 +58,21 @@ jobs:
       - name: Extract w64devkit
         run: expand-archive -path ${{github.workspace}}\w64devkit.zip -destinationpath ${{github.workspace}}
       - name: Download SDL2-devel
-        run: invoke-webrequest https://github.com/libsdl-org/SDL/releases/download/release-2.30.3/SDL2-devel-2.30.3-mingw.zip -outfile ${{github.workspace}}\sdl2-devel.zip
+        run: invoke-webrequest https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-devel-2.30.6-mingw.zip -outfile ${{github.workspace}}\sdl2-devel.zip
       - name: Extract SDL2-devel
         run: expand-archive -path ${{github.workspace}}\sdl2-devel.zip -destinationpath ${{github.workspace}}
       - name: Copy SDL2-devel contents to w64devkit
         run: |
-          robocopy ${{github.workspace}}\SDL2-2.30.3\i686-w64-mingw32 ${{github.workspace}}\w64devkit\i686-w64-mingw32 /s ; if ($lastexitcode -lt 8) { $global:LASTEXITCODE = $null }
-          robocopy ${{github.workspace}}\SDL2-2.30.3\i686-w64-mingw32 ${{github.workspace}}\w64devkit /s ; if ($lastexitcode -lt 8) { $global:LASTEXITCODE = $null }
+          robocopy ${{github.workspace}}\SDL2-2.30.6\i686-w64-mingw32 ${{github.workspace}}\w64devkit\i686-w64-mingw32 /s ; if ($lastexitcode -lt 8) { $global:LASTEXITCODE = $null }
+          robocopy ${{github.workspace}}\SDL2-2.30.6\i686-w64-mingw32 ${{github.workspace}}\w64devkit /s ; if ($lastexitcode -lt 8) { $global:LASTEXITCODE = $null }
       - name: Set environment variables and build
         run: |
           $env:Path = "${{github.workspace}}\w64devkit\bin;" + $env:Path
           cmake -B build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CXX_FLAGS="-isystem ${{github.workspace}}\w64devkit\include" -G "MinGW Makefiles"
           cmake --build build --config ${{env.BUILD_TYPE}}
           strip ${{github.workspace}}\edge-classic.exe
       - name: Copy SDL2 DLL
-        run: copy-item -path ${{github.workspace}}\SDL2-2.30.3\i686-w64-mingw32\bin\SDL2.dll -destination ${{github.workspace}}
+        run: copy-item -path ${{github.workspace}}\SDL2-2.30.6\i686-w64-mingw32\bin\SDL2.dll -destination ${{github.workspace}}
       - uses: actions/upload-artifact@v4
         with:
           name: edge-classic-mingw

diff --git a/edge_base/blasphemer/graphics/STBARL.lmp b/edge_base/blasphemer/graphics/STBARL.lmp
diff --git a/edge_base/blasphemer/graphics/STBARR.lmp b/edge_base/blasphemer/graphics/STBARR.lmp
diff --git a/edge_base/blasphemer/scripts/lua/edge_hud.lua b/edge_base/blasphemer/scripts/lua/edge_hud.lua
@@ -68,8 +68,8 @@ function heretic_status_bar()
     tempwidth = hud.get_image_width("BARBACK")
     centerOffsetX = tempwidth / 2;
 
-    hud.draw_image(-53, 158, "STBARL") -- Widescreen border
-    hud.draw_image(320, 158, "STBARR") -- Widescreen border
+    hud.draw_image(-83, 158, "STBARL") -- Widescreen border
+    hud.draw_image(320, 158, "STBARR")  -- Widescreen border
 
     --order is important because some of them overlap
     --hud.draw_image(0, 158, "BARBACK")