From 673cf1e59ebfc4eabefdec7448ac52779d3d15b4 Mon Sep 17 00:00:00 2001 From: wkdgmr Date: Wed, 12 Feb 2025 07:02:50 +0000 Subject: [PATCH 1/3] Update Dockerfile to fix D1GraphicsTool install step --- .devcontainer/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 38cd816e88f..8ae17816fcd 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -28,9 +28,9 @@ RUN git clone https://github.com/diasurgical/devilutionx-mpq-tools.git /tmp/devi rm -rf /tmp/devilutionx-mpq-tools # Install d1-graphics-tool -RUN curl -O -L https://github.com/diasurgical/d1-graphics-tool/releases/latest/download/D1GraphicsTool-Linux-Qt5.deb && \ - dpkg -i D1GraphicsTool-Linux-Qt5.deb && \ - rm D1GraphicsTool-Linux-Qt5.deb +RUN curl -O -L https://github.com/diasurgical/d1-graphics-tool/releases/download/1.1.0/D1GraphicsTool-Linux-x64.deb && \ + dpkg -i D1GraphicsTool-Linux-x64.deb && \ + rm D1GraphicsTool-Linux-x64.deb # Download spawn.mpq and fonts.mpq RUN curl --create-dirs -O -L --output-dir /usr/local/share/diasurgical/devilutionx/ \ From e1b5939b3c5b578ea9cd831fff9722a456e77031 Mon Sep 17 00:00:00 2001 From: wkdgmr Date: Wed, 12 Feb 2025 09:18:53 -0500 Subject: [PATCH 2/3] Disable New Game and Quit Game menu options when player is Dead --- Source/gamemenu.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp index 2cce3d8d66b..984eec5ea32 100644 --- a/Source/gamemenu.cpp +++ b/Source/gamemenu.cpp @@ -20,6 +20,7 @@ #include "pfile.h" #include "qol/floatingnumbers.h" #include "utils/language.h" +#include "player.h" #ifndef USE_SDL1 #include "controls/touch/renderers.h" @@ -98,6 +99,8 @@ void GamemenuUpdateSingle() void GamemenuUpdateMulti() { sgMultiMenu[2].setEnabled(MyPlayerIsDead); + sgMultiMenu[1].setEnabled(!MyPlayerIsDead); + sgMultiMenu[3].setEnabled(!MyPlayerIsDead); } void GamemenuPrevious(bool /*bActivate*/) From b36a8e398d7bffcf31e3f582079e8c47ad5968e7 Mon Sep 17 00:00:00 2001 From: wkdgmr Date: Wed, 12 Feb 2025 10:59:20 -0500 Subject: [PATCH 3/3] clang --- Source/gamemenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp index 984eec5ea32..c99ce6ca476 100644 --- a/Source/gamemenu.cpp +++ b/Source/gamemenu.cpp @@ -18,9 +18,9 @@ #include "multi.h" #include "options.h" #include "pfile.h" +#include "player.h" #include "qol/floatingnumbers.h" #include "utils/language.h" -#include "player.h" #ifndef USE_SDL1 #include "controls/touch/renderers.h"