Revert multi.h to not include storm.h

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.

Source/multi.cpp

@@ -1,4 +1,5 @@
 #include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 #include "../DiabloUI/diabloui.h"
 
 BOOLEAN gbSomebodyWonGameKludge; // weak

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];

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