diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml index b7e6b9b28..b1384a266 100644 --- a/.github/workflows/build_docker.yml +++ b/.github/workflows/build_docker.yml @@ -22,7 +22,7 @@ jobs: - name: Build Docker image (Windows) run: | - docker build -t "rrdash/tomb1main:latest" . -f docker/game/win/Dockerfile + docker build -t "rrdash/tomb1main:latest" . -f docker/game-win/Dockerfile docker push "rrdash/tomb1main:latest" publish_docker_image_linux: @@ -43,5 +43,5 @@ jobs: - name: Build Docker image (Linux) run: | - docker build -t "rrdash/tomb1main-linux:latest" . -f docker/game/linux/Dockerfile + docker build -t "rrdash/tomb1main-linux:latest" . -f docker/game-linux/Dockerfile docker push "rrdash/tomb1main-linux:latest" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1bb5b30a5..5e1325417 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: publish_release: name: Create a GitHub release runs-on: ubuntu-latest - needs: [build_game_win, build_installer] + needs: [build_game_win, build_game_linux, build_installer] steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/docker/game-linux/Dockerfile b/docker/game-linux/Dockerfile index a44499f2b..f1c460573 100644 --- a/docker/game-linux/Dockerfile +++ b/docker/game-linux/Dockerfile @@ -20,7 +20,7 @@ RUN apt-get update \ # libav -FROM base as libav +FROM base AS libav RUN apt-get install -y \ nasm \ gcc \ @@ -68,7 +68,7 @@ RUN cd FFmpeg \ # SDL -FROM base as sdl +FROM base AS sdl RUN git clone https://github.com/libsdl-org/SDL -b SDL2 RUN apt-get install -y \ libgl1-mesa-dev \ diff --git a/docker/game-linux/entrypoint.sh b/docker/game-linux/entrypoint.sh index 720b29a52..e071d4284 100755 --- a/docker/game-linux/entrypoint.sh +++ b/docker/game-linux/entrypoint.sh @@ -11,8 +11,8 @@ fi cd /app/build/linux; meson compile if [ "$TARGET" = release ]; then - for file in Tomb1Main; do - upx -t "$file" || ( strip "$file" && upx "$file" ) - done + exe_file=Tomb1Main + if ! upx -t "$exe_file"; then + strip "$exe_file" && upx "$exe_file" + fi fi - diff --git a/src/game/inject.c b/src/game/inject.c index 304a3be9d..5f687edf3 100644 --- a/src/game/inject.c +++ b/src/game/inject.c @@ -1490,7 +1490,7 @@ static void Inject_AddRoomFace(INJECTION *injection) // Increment the relevant number of faces and work out the // starting point in the mesh for the injection. - int inject_pos; + int inject_pos = 0; int num_data = r->data[data_index]; // Quads if (face_type == FT_TEXTURED_QUAD) { r->data[data_index]++; diff --git a/src/game/overlay.c b/src/game/overlay.c index 4aa1cfdb6..f257c61a9 100644 --- a/src/game/overlay.c +++ b/src/game/overlay.c @@ -339,7 +339,7 @@ static void Overlay_DrawPickup3D(DISPLAY_PICKUP_INFO *pu) int32_t src_x = padding_x + (pu->grid_x + 1.0f) * pickup_width; int32_t src_y = 0; - float ease; + float ease = 1.0f; switch (pu->phase) { case DPP_EASE_IN: ease = Overlay_Ease(pu->duration, MAX_PICKUP_DURATION_EASE_IN);