From bd6eebedb19e1ea27d48e64b038cdf4f490e3ff9 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Sat, 15 Feb 2020 00:18:39 +0100
Subject: [PATCH] Drop storm_dx.cpp

---
 3rdParty/Storm/Source/storm.h |  2 --
 CMakeLists.txt                |  1 -
 Source/palette.cpp            |  7 ++++++-
 SourceX/storm/storm.cpp       |  6 +++---
 SourceX/storm/storm_dx.cpp    | 27 ---------------------------
 5 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 SourceX/storm/storm_dx.cpp

diff --git a/3rdParty/Storm/Source/storm.h b/3rdParty/Storm/Source/storm.h
index b3c03db49..dd5548da2 100644
--- a/3rdParty/Storm/Source/storm.h
+++ b/3rdParty/Storm/Source/storm.h
@@ -239,8 +239,6 @@ SBmpLoadImage(
     DWORD      *pdwHeight,
     DWORD      *pdwBpp);
 
-void SDrawUpdatePalette(unsigned int firstentry, unsigned int numentries, SDL_Color *pPalEntries, int a4);
-
 /*  SMemAlloc @ 401
  *
  *  Allocates a block of memory. This block is different
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86d9d50c4..ef00174e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -262,7 +262,6 @@ set(devilutionx_SRCS
   SourceX/soundsample.cpp
   SourceX/storm/storm.cpp
   SourceX/storm/storm_net.cpp
-  SourceX/storm/storm_dx.cpp
   SourceX/dvlnet/abstract_net.cpp
   SourceX/dvlnet/loopback.cpp
   SourceX/dvlnet/packet.cpp
diff --git a/Source/palette.cpp b/Source/palette.cpp
index 7ad0d029c..da6a6e270 100644
--- a/Source/palette.cpp
+++ b/Source/palette.cpp
@@ -1,4 +1,5 @@
 #include "all.h"
+#include "../SourceX/display.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 DEVILUTION_BEGIN_NAMESPACE
@@ -15,7 +16,11 @@ BOOLEAN sgbFadedIn = TRUE;
 
 void palette_update()
 {
-	SDrawUpdatePalette(0, 256, system_palette, 0);
+	assert(palette);
+	if (SDLC_SetSurfaceAndPaletteColors(pal_surface, palette, system_palette, 0, 256) < 0) {
+		ErrSdl();
+	}
+	pal_surface_palette_version++;
 }
 
 void ApplyGamma(SDL_Color *dst, const SDL_Color *src, int n)
diff --git a/SourceX/storm/storm.cpp b/SourceX/storm/storm.cpp
index cf4a7c8fc..ac9697f7d 100644
--- a/SourceX/storm/storm.cpp
+++ b/SourceX/storm/storm.cpp
@@ -609,7 +609,7 @@ void SVidPlayBegin(char *filename, int a2, int a3, int a4, int a5, int flags, HA
 		}
 	}
 #endif
-	memcpy(SVidPreviousPalette, orig_palette, 1024);
+	memcpy(SVidPreviousPalette, orig_palette, sizeof(SVidPreviousPalette));
 
 	// Copy frame to buffer
 	SVidSurface = SDL_CreateRGBSurfaceWithFormatFrom(
@@ -668,7 +668,7 @@ BOOL SVidPlayContinue(void)
 			orig_palette[i].g = palette_data[i * 3 + 1];
 			orig_palette[i].b = palette_data[i * 3 + 2];
 		}
-		memcpy(logical_palette, orig_palette, 1024);
+		memcpy(logical_palette, orig_palette, sizeof(logical_palette));
 
 		if (SDLC_SetSurfaceAndPaletteColors(SVidSurface, SVidPalette, colors, 0, 256) <= -1) {
 			SDL_Log(SDL_GetError());
@@ -782,7 +782,7 @@ void SVidPlayEnd(HANDLE video)
 	SFileCloseFile(video);
 	video = NULL;
 
-	memcpy(orig_palette, SVidPreviousPalette, 1024);
+	memcpy(orig_palette, SVidPreviousPalette, sizeof(orig_palette));
 #ifndef USE_SDL1
 	if (renderer) {
 		SDL_DestroyTexture(texture);
diff --git a/SourceX/storm/storm_dx.cpp b/SourceX/storm/storm_dx.cpp
deleted file mode 100644
index 3529a70cb..000000000
--- a/SourceX/storm/storm_dx.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <SDL.h>
-
-#include "all.h"
-#include "../3rdParty/Storm/Source/storm.h"
-#include "display.h"
-#include "stubs.h"
-
-namespace dvl {
-
-void SDrawUpdatePalette(unsigned int firstentry, unsigned int numentries, SDL_Color *pPalEntries, int a4)
-{
-	assert(firstentry == 0);
-	assert(numentries == 256);
-
-	SDL_Color colors[256];
-	for (unsigned int i = firstentry; i < numentries; i++) {
-		colors[i] = pPalEntries[i];
-	}
-
-	assert(palette);
-	if (SDLC_SetSurfaceAndPaletteColors(pal_surface, palette, colors, firstentry, numentries) <= -1) {
-		ErrSdl();
-	}
-	pal_surface_palette_version++;
-}
-
-} // namespace dvl