From a53a2a724fcd66609837b53b57e0b582abf4e0f7 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sun, 7 Nov 2021 11:34:00 +0000 Subject: [PATCH] OpenDingux: Minor fixes --- Packaging/OpenDingux/build.sh | 1 + Packaging/OpenDingux/lepus-manual.txt | 2 +- Source/utils/sdl_compat.h | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Packaging/OpenDingux/build.sh b/Packaging/OpenDingux/build.sh index 5ba7f2286..235da6c40 100755 --- a/Packaging/OpenDingux/build.sh +++ b/Packaging/OpenDingux/build.sh @@ -80,6 +80,7 @@ cmake_configure() { "-DTARGET_PLATFORM=$TARGET" \ -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN}/usr/share/buildroot/toolchainfile.cmake" \ -DDEVILUTIONX_SYSTEM_LIBSODIUM=OFF \ + -DDEVILUTIONX_SYSTEM_BZIP2=OFF \ -DSTACK_PROTECTOR=OFF \ "$@" } diff --git a/Packaging/OpenDingux/lepus-manual.txt b/Packaging/OpenDingux/lepus-manual.txt index 1555c0cca..e3847a144 100644 --- a/Packaging/OpenDingux/lepus-manual.txt +++ b/Packaging/OpenDingux/lepus-manual.txt @@ -1,5 +1,5 @@ Copy diabdat.mpq from your CD (or GoG install folder) to: -~/.local/share/diasurgical/ +~/.local/share/diasurgical/devilution/ For Hellfire, also copy hellfire.mpq, hfmonk.mpq, hfmusic.mpq, and hfvoice.mpq. diff --git a/Source/utils/sdl_compat.h b/Source/utils/sdl_compat.h index 5dfc3d05f..bf1d79d4f 100644 --- a/Source/utils/sdl_compat.h +++ b/Source/utils/sdl_compat.h @@ -74,13 +74,13 @@ inline int SDLC_SetSurfaceAndPaletteColors(SDL_Surface *surface, SDL_Palette *pa SDL_memcpy(palette->colors + firstcolor, colors, ncolors * sizeof(*colors)); #if SDL1_VIDEO_MODE_BPP == 8 - // When the video surface is 8bit, we need to set the output pallet as well. + // When the video surface is 8bit, we need to set the output palette as well. SDL_SetColors(SDL_GetVideoSurface(), colors, firstcolor, ncolors); #endif // In SDL1, the surface always has its own distinct palette, so we need to // update it as well. return SDL_SetPalette(surface, SDL_LOGPAL, colors, firstcolor, ncolors) - 1; -#else +#else // !USE_SDL1 if (SDL_SetPaletteColors(palette, colors, firstcolor, ncolors) < 0) return -1; if (surface->format->palette != palette)