From faeb360c88bcf59b1c3219144bde89e9e88b0db8 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Thu, 9 May 2019 00:32:25 +0200
Subject: [PATCH] Revert multi.h to not include storm.h

---
 3rdParty/Storm/Source/storm.h | 7 -------
 Source/multi.cpp              | 1 +
 Source/multi.h                | 2 --
 structs.h                     | 7 +++++++
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/3rdParty/Storm/Source/storm.h b/3rdParty/Storm/Source/storm.h
index c66f36752..751d22b32 100644
--- a/3rdParty/Storm/Source/storm.h
+++ b/3rdParty/Storm/Source/storm.h
@@ -372,13 +372,6 @@ typedef struct _s_evt
   DWORD dwSize;
 } S_EVT, *PS_EVT;
 
-typedef struct _SNETEVENT {
-	int eventid;
-	int playerid;
-	void *data;
-	int databytes;
-} _SNETEVENT;
-
 typedef void (STORMAPI *SEVTHANDLER)(struct _SNETEVENT *);
 
 // @TODO: "type" is unknown.
diff --git a/Source/multi.cpp b/Source/multi.cpp
index 6e1eb5cf1..8bbca9fd6 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -1,4 +1,5 @@
 #include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 #include "../DiabloUI/diabloui.h"
 
 BOOLEAN gbSomebodyWonGameKludge; // weak
diff --git a/Source/multi.h b/Source/multi.h
index 142ae8268..26330aa5f 100644
--- a/Source/multi.h
+++ b/Source/multi.h
@@ -2,8 +2,6 @@
 #ifndef __MULTI_H__
 #define __MULTI_H__
 
-#include "../3rdParty/Storm/Source/storm.h"
-
 extern BOOLEAN gbSomebodyWonGameKludge; // weak
 extern char szPlayerDescript[128];
 extern WORD sgwPackPlrOffsetTbl[MAX_PLRS];
diff --git a/structs.h b/structs.h
index 09299c300..9a1a1854c 100644
--- a/structs.h
+++ b/structs.h
@@ -1262,6 +1262,13 @@ typedef struct _SNETCAPS {
 	int defaultturnsintransit;
 } _SNETCAPS;
 
+typedef struct _SNETEVENT {
+	int eventid;
+	int playerid;
+	void *data;
+	int databytes;
+} _SNETEVENT;
+
 // TPDEF PTR FCN UCHAR SNETABORTPROC
 // TPDEF PTR FCN UCHAR SNETCATEGORYPROC
 // TPDEF PTR FCN UCHAR SNETCHECKAUTHPROC