Added d3d8types.h for ease of use, and moved d3d8 include to SADXFunc…

…tions.h specifically.
X-Hax · Jul 10, 2015 · 440d72b · 440d72b
1 parent 9974fce
commit 440d72b
Show file tree

Hide file tree

Showing 3 changed files with 1,677 additions and 2 deletions.
diff --git a/SADXModLoader/include/SADXModLoader.h b/SADXModLoader/include/SADXModLoader.h
@@ -7,7 +7,6 @@
 #define SADXMODLOADER_H
 
 #include "ninja.h"
-#include <d3d8.h>
 
 // HACK: Fixes conflict with Windows API PlaySound.
 #ifdef PlaySound

diff --git a/SADXModLoader/include/SADXModLoader/SADXFunctions.h b/SADXModLoader/include/SADXModLoader/SADXFunctions.h
@@ -8,6 +8,7 @@
 
 #include <stdint.h>
 #include "../ModLoader/MemAccess.h"
+#include "../d3d8types.h"
 #include "SADXStructs.h"
 
 // SADX Functions
@@ -426,7 +427,7 @@ static inline void LoadCharBossSounds(int a2)
 
 // uint16_t __usercall<ax>(byte *a2<esi>)
 static const void *const CalcSaveChecksumPtr = (void*)0x42CF90;
-static inline uint16_t CalcSaveChecksum(byte *a2)
+static inline uint16_t CalcSaveChecksum(uint8_t *a2)
 {
 	uint16_t result;
 	__asm