diff --git a/.github/workflows/build-targets.yml b/.github/workflows/build-targets.yml index c6307b34b..42ba73e0c 100644 --- a/.github/workflows/build-targets.yml +++ b/.github/workflows/build-targets.yml @@ -47,7 +47,7 @@ jobs: path: .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.exe macos-build: - runs-on: macos-13 + runs-on: macos-14 strategy: matrix: ARCH: ["arm64","intel"] diff --git a/.github/workflows/scripts/homebrew.sh b/.github/workflows/scripts/homebrew.sh index 9e7fedf09..cd40407fb 100755 --- a/.github/workflows/scripts/homebrew.sh +++ b/.github/workflows/scripts/homebrew.sh @@ -42,11 +42,11 @@ function install_arm64() { export HOMEBREW_DIR="/Users/runner/Library/Caches/Homebrew/downloads" brew reinstall --quiet pkg-config - brew fetch --force --bottle-tag=arm64_big_sur "${dependencies[@]}" + brew fetch --force --bottle-tag=arm64_sonoma "${dependencies[@]}" for dependency in "${dependencies[@]}"; do echo "Installing $dependency" - brew reinstall --quiet "${HOMEBREW_DIR}"/*"${dependency}"-*.arm64_big_sur.bottle*.tar.gz + brew reinstall --quiet "${HOMEBREW_DIR}"/*"${dependency}"-*.arm64_sonoma.bottle*.tar.gz done } @@ -78,7 +78,7 @@ function build_intel() { function build_arm64() { export CPU="arm64" - make strip DARWIN_TARGET=arm64-apple-macos12 + make strip DARWIN_TARGET=arm64-apple-macos14 } case $1 in diff --git a/src/hud_262.c b/src/hud_262.c index a4102b4f0..7ddb625e4 100644 --- a/src/hud_262.c +++ b/src/hud_262.c @@ -35,6 +35,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "menu.h" #include "image.h" +qbool CachePic_RemoveByPic(mpic_t* pic); + static char *hud262_load_buff = NULL; extern cvar_t cl_hud; @@ -171,14 +173,14 @@ void Hud_Add_f(void) mpic_t* tmp_pic; if (pic_path && strlen(pic_path) > 0) { // Try loading the pic. - if (!(tmp_pic = Draw_CachePicSafe(pic_path, false, true))) { + if (!tmp_pic = Draw_CachePicSafe(pic_path, false, true)) { Com_Printf("Couldn't load picture %s for '%s'\n", pic_path, a2); return; } + elem = Hud_NewElement(); + elem->contents = tmp_pic; + elem->flags = HUD_IMAGE | HUD_ENABLED; } - elem = Hud_NewElement(); - elem->contents = tmp_pic; - elem->flags = HUD_IMAGE | HUD_ENABLED; } else { Com_Printf("\"%s\" is not a valid hud type\n", a2);