More cleanup

CMake/mingwcc.cmake

@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.13)
-
 SET(CROSS_PREFIX "/usr" CACHE STRING "crosstool-NG prefix")
 
 SET(CMAKE_SYSTEM_NAME Windows)

CMakeLists.txt

@@ -159,12 +159,14 @@ add_executable(devilutionx
   SourceX/miniwin/misc.cpp
   SourceX/miniwin/misc_io.cpp
   SourceX/miniwin/misc_msg.cpp
+  SourceX/miniwin/misc_dx.cpp
   SourceX/miniwin/rand.cpp
   SourceX/miniwin/thread.cpp
-  SourceX/miniwin_dsound.cpp
+  SourceX/miniwin/dsound.cpp
   SourceX/sound.cpp
-  SourceX/storm.cpp
-  SourceX/storm_net.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
@@ -185,7 +187,11 @@ add_executable(devilutionx
   SourceX/main.cpp)
 
 target_include_directories(devilution PUBLIC Source SourceS)
-target_include_directories(devilutionx PRIVATE SourceX 3rdParty/asio/include)
+target_include_directories(devilutionx PRIVATE
+  SourceX
+  3rdParty/asio/include
+  3rdParty/Radon/Radon/include
+  3rdParty/libsmacker)
 
 target_link_libraries(devilution PUBLIC Threads::Threads)
 target_link_libraries(devilutionx PRIVATE

SourceS/miniwin.h

@@ -30,6 +30,7 @@
 #include "miniwin/ui.h"
 #include "miniwin/thread.h"
 #include "miniwin/rand.h"
+#include "storm_full.h"
 
 #ifdef DEVILUTION_ENGINE
 #include "miniwin/misc_macro.h"

SourceS/miniwin/misc.h

@@ -45,10 +45,6 @@ typedef int INT;
 typedef unsigned int UINT;
 typedef unsigned int *PUINT;
 
-// GCC qword alignment is 4, MSVC is 8, work around by introducing a more aligned type
-typedef long long INT64;
-typedef unsigned long long UINT64;
-
 typedef intptr_t INT_PTR, *PINT_PTR;
 typedef uintptr_t UINT_PTR, *PUINT_PTR;
 

SourceS/storm_full.h

@@ -0,0 +1,11 @@
+#pragma once
+
+namespace dvl {
+extern "C" {
+
+extern DWORD nLastError;
+
+void TranslateFileName(char *dst, int dstLen, const char *src);
+
+}
+} // namespace dvl

SourceX/dx.cpp

@@ -448,77 +448,4 @@ void dx_reinit()
 	UNIMPLEMENTED();
 }
 
-//
-// Storm functions
-//
-
-BOOL SDrawUpdatePalette(unsigned int firstentry, unsigned int numentries, PALETTEENTRY *pPalEntries, int a4)
-{
-	assert(firstentry == 0);
-	assert(numentries == 256);
-
-	SDL_Color colors[256];
-	for (unsigned int i = firstentry; i < numentries; i++) {
-		SDL_Color *c = &colors[i];
-		PALETTEENTRY *p = &pPalEntries[i];
-		c->r = p->peRed;
-		c->g = p->peGreen;
-		c->b = p->peBlue;
-		c->a = SDL_ALPHA_OPAQUE;
-	}
-
-	assert(palette);
-	if (SDL_SetPaletteColors(palette, colors, firstentry, numentries) != 0) {
-		SDL_Log("SDL_SetPaletteColors: %s\n", SDL_GetError());
-		return false;
-	}
-
-	if (pal_surface) {
-		sdl_update_entire_surface();
-		sdl_present_surface();
-	}
-
-	return true;
-}
-
-//
-// Windows API functions
-//
-
-WINBOOL SetCursorPos(int X, int Y)
-{
-	assert(renderer);
-	assert(window);
-
-	SDL_Rect view;
-	SDL_RenderGetViewport(renderer, &view);
-	X += view.x;
-	Y += view.y;
-
-	float scaleX;
-	SDL_RenderGetScale(renderer, &scaleX, NULL);
-	X *= scaleX;
-	Y *= scaleX;
-
-	SDL_WarpMouseInWindow(window, X, Y);
-	return true;
-}
-
-int ShowCursor(WINBOOL bShow)
-{
-	SDL_ShowCursor(bShow ? SDL_ENABLE : SDL_DISABLE);
-
-	return bShow;
-}
-
-WINBOOL TextOutA(HDC hdc, int x, int y, LPCSTR lpString, int c)
-{
-	DUMMY_ONCE();
-
-	assert(window);
-	SDL_SetWindowTitle(window, lpString);
-
-	return true;
-}
-
-}
+}  // namespace dvl

SourceX/dx.h

@@ -15,4 +15,4 @@ void sdl_present_surface();
 
 void sdl_update_entire_surface();
 
-}
+}  // namespace dvl

SourceX/miniwin/dsound.cpp

@@ -1,4 +1,4 @@
-#include "miniwin_dsound.h"
+#include "miniwin/dsound.h"
 
 #include <SDL.h>
 

SourceX/miniwin/misc_dx.cpp

@@ -0,0 +1,45 @@
+#include <SDL.h>
+
+#include "devilution.h"
+#include "dx.h"
+#include "stubs.h"
+
+namespace dvl {
+
+WINBOOL SetCursorPos(int X, int Y)
+{
+	assert(renderer);
+	assert(window);
+
+	SDL_Rect view;
+	SDL_RenderGetViewport(renderer, &view);
+	X += view.x;
+	Y += view.y;
+
+	float scaleX;
+	SDL_RenderGetScale(renderer, &scaleX, NULL);
+	X *= scaleX;
+	Y *= scaleX;
+
+	SDL_WarpMouseInWindow(window, X, Y);
+	return true;
+}
+
+int ShowCursor(WINBOOL bShow)
+{
+	SDL_ShowCursor(bShow ? SDL_ENABLE : SDL_DISABLE);
+
+	return bShow;
+}
+
+WINBOOL TextOutA(HDC hdc, int x, int y, LPCSTR lpString, int c)
+{
+	DUMMY_ONCE();
+
+	assert(window);
+	SDL_SetWindowTitle(window, lpString);
+
+	return true;
+}
+
+}  // namespace dvl

SourceX/miniwin/misc_io.cpp

@@ -8,17 +8,6 @@
 
 namespace dvl {
 
-extern "C" void TranslateFileName(char *dst, int dstLen, const char *src)
-{
-	for (int i = 0; i < dstLen; i++) {
-		char c = *src++;
-		dst[i] = c == '\\' ? '/' : c;
-		if (!c) {
-			break;
-		}
-	}
-}
-
 static std::set<HANDLE> files;
 
 HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,

SourceX/storm/storm.cpp

@@ -1,9 +1,8 @@
-#include "../3rdParty/Radon/Radon/include/Radon.hpp"
-#include "../3rdParty/libsmacker/smacker.h"
-
 #include <unistd.h>
 #include <SDL.h>
 #include <SDL_mixer.h>
+#include <Radon.hpp>
+#include <smacker.h>
 
 #include "devilution.h"
 #include "stubs.h"
@@ -12,7 +11,18 @@
 
 namespace dvl {
 
-extern "C" DWORD nLastError = 0;
+DWORD nLastError = 0;
+
+void TranslateFileName(char *dst, int dstLen, const char *src)
+{
+	for (int i = 0; i < dstLen; i++) {
+		char c = *src++;
+		dst[i] = c == '\\' ? '/' : c;
+		if (!c) {
+			break;
+		}
+	}
+}
 
 std::string getIniPath()
 {

SourceX/storm/storm_dx.cpp

@@ -0,0 +1,38 @@
+#include <SDL.h>
+
+#include "devilution.h"
+#include "dx.h"
+#include "stubs.h"
+
+namespace dvl {
+
+BOOL SDrawUpdatePalette(unsigned int firstentry, unsigned int numentries, PALETTEENTRY *pPalEntries, int a4)
+{
+	assert(firstentry == 0);
+	assert(numentries == 256);
+
+	SDL_Color colors[256];
+	for (unsigned int i = firstentry; i < numentries; i++) {
+		SDL_Color *c = &colors[i];
+		PALETTEENTRY *p = &pPalEntries[i];
+		c->r = p->peRed;
+		c->g = p->peGreen;
+		c->b = p->peBlue;
+		c->a = SDL_ALPHA_OPAQUE;
+	}
+
+	assert(palette);
+	if (SDL_SetPaletteColors(palette, colors, firstentry, numentries) != 0) {
+		SDL_Log("SDL_SetPaletteColors: %s\n", SDL_GetError());
+		return false;
+	}
+
+	if (pal_surface) {
+		sdl_update_entire_surface();
+		sdl_present_surface();
+	}
+
+	return true;
+}
+
+}  // namespace dvl