Added a BUNCH of stuff.

X-Hax · Mar 18, 2016 · f34e91f · f34e91f
1 parent 55b4182
commit f34e91f
Show file tree

Hide file tree

Showing 9 changed files with 4,010 additions and 415 deletions.
diff --git a/SADXModLoader/FixFOV.cpp b/SADXModLoader/FixFOV.cpp
@@ -36,7 +36,6 @@ static void DisplayVideoFrame_FixAspectRatio()
 }
 
 // Fix for neglected width and height in global NJS_SCREEN
-FunctionPointer(void, SetupScreen, (NJS_SCREEN*), 0x00788240);
 static void __cdecl SetupScreenFix(NJS_SCREEN* screen)
 {
 	_nj_screen_ = *screen;

diff --git a/SADXModLoader/TextureReplacement.cpp b/SADXModLoader/TextureReplacement.cpp
@@ -77,9 +77,9 @@ static bool wasLoading = false;
 
 void InitTextureReplacement()
 {
-	WriteJump((void*)0x004210A0, LoadPVM_C);
+	WriteJump((void*)LoadPVM_C, LoadPVM_C_r);
 	WriteJump((void*)0x0077FC80, njLoadTexture_Hook);
-	WriteJump((void*)0x004228E0, njLoadTexture_Wrapper);
+	WriteJump((void*)njLoadTexture_Wrapper, njLoadTexture_Wrapper_r);
 }
 
 #pragma region Index Parsing
@@ -362,7 +362,7 @@ bool ReplacePVM(const std::wstring& filename, NJS_TEXLIST* texlist)
 	return result;
 }
 
-void __cdecl LoadPVM_C(const char* filename, NJS_TEXLIST* texlist)
+void __cdecl LoadPVM_C_r(const char* filename, NJS_TEXLIST* texlist)
 {
 	mipmap::IsBlacklistedPVM(filename);
 	string filename_str(filename);
@@ -448,7 +448,7 @@ bool ReplacePVR(const std::string& filename, NJS_TEXMEMLIST** tex)
 	return false;
 }
 
-Sint32 __cdecl njLoadTexture_Wrapper(NJS_TEXLIST* texlist)
+Sint32 __cdecl njLoadTexture_Wrapper_r(NJS_TEXLIST* texlist)
 {
 	CheckCache();
 	LoadingFile = true;

diff --git a/SADXModLoader/TextureReplacement.h b/SADXModLoader/TextureReplacement.h
@@ -16,8 +16,8 @@ NJS_TEXMEMLIST* LoadTexture(const std::wstring& _path, uint32_t globalIndex, con
 bool ParseIndex(const std::wstring& path, std::vector<CustomTextureEntry>& entries);
 std::vector<CustomTextureEntry> ParseIndex(const std::wstring& path);
 
-Sint32 njLoadTexture_Wrapper(NJS_TEXLIST* texlist);
+Sint32 njLoadTexture_Wrapper_r(NJS_TEXLIST* texlist);
 Sint32 njLoadTexture_Hook(NJS_TEXLIST* texlist);
-void __cdecl LoadPVM_C(const char* filename, NJS_TEXLIST* texlist);
+void __cdecl LoadPVM_C_r(const char* filename, NJS_TEXLIST* texlist);
 
 extern std::vector<std::wstring> TexturePackPaths;
diff --git a/SADXModLoader/dllmain.cpp b/SADXModLoader/dllmain.cpp
@@ -327,7 +327,7 @@ uint8_t wndpatch[] = { 0xA1, 0x30, 0xFD, 0xD0, 0x03, 0xEB, 0x08 }; // mov eax,[h
 int curscrnsz[2];
 
 DataPointer(int, Windowed, 0x38A5DC4);
-static void CreateSADXWindow(HINSTANCE hInstance, int nCmdShow)
+static void CreateSADXWindow_r(HINSTANCE hInstance, int nCmdShow)
 {
 	WNDCLASSA v8; // [sp+4h] [bp-28h]@1
 
@@ -497,7 +497,7 @@ static __declspec(naked) void sub_789E50_r()
 		mov ebx, [esp+4]
 		push ebx
 		push eax
-		call CreateSADXWindow
+		call CreateSADXWindow_r
 		add esp, 8
 		retn
 	}
@@ -1767,9 +1767,7 @@ static unordered_map<wstring, dllexportcontainer> dllexports;
 
 struct SaveFileInfo { char *Filename; DWORD LowDate; DWORD HighDate; SaveFileInfo *Next; };
 
-VoidFunc(SaveSave, 0x42D630);
 DataPointer(SaveFileInfo *, SaveFiles, 0x3C5E8B8);
-VoidFunc(InputThing__Ctor, 0x40F350);
 void __cdecl WriteSaveFile_r()
 {
 	char v0; // bl@1

diff --git a/SADXModLoader/include/ModLoader/MemAccess.h b/SADXModLoader/include/ModLoader/MemAccess.h
@@ -185,7 +185,6 @@ static inline BOOL WriteCall(void *writeaddress, void *funcaddress)
 #define ThiscallFunctionPointer(RETURN_TYPE, NAME, ARGS, ADDRESS) \
 	static RETURN_TYPE (__thiscall *const NAME)ARGS = (RETURN_TYPE (__thiscall *)ARGS)ADDRESS
 #define VoidFunc(NAME, ADDRESS) FunctionPointer(void,NAME,(void),ADDRESS)
-#define ObjectFunc(NAME, ADDRESS) FunctionPointer(void,NAME,(ObjectMaster *obj),ADDRESS)
 
 #define patchdecl(address,data) { (void*)address, arrayptrandsize(data) }
 #define ptrdecl(address,data) { (void*)address, (void*)data }