Changeset 877 for Daodan/src/patches/Patches.c

Timestamp:

Jun 2, 2013, 1:25:34 PM (11 years ago)

Author:

alloc

Message:

Daodan: Moved flatline to subfolder, flatline enabled through patch "flatline"

File:

• Daodan/src/patches/Patches.c (modified) (9 diffs)

Daodan/src/patches/Patches.c

@@ -10 +10 @@
 #include "../Daodan_Utility.h"
 #include "../Daodan_Win32.h"
-#ifdef FLATLINE
-#include "../Flatline_BSL.h"
-#include "../Flatline_Hooks.h"
-#endif
+#include "../flatline/Flatline_BSL.h"
+#include "../flatline/Flatline_Hooks.h"
 #include "../Oni.h"
 
@@ -44 +42 @@
         if (opt_usedaodanbsl)
                 SLrDaodan_Initialize();
+        if (patch_flatline)
+                SLrFlatline_Initialize();
 }
 
@@ -81 +81 @@
 
 
-int FLrHook_DebugNameTextureInit(short width, short height, int type, int allocated, int flags, char* name, void** output)
+int DD_Patch_DebugNameTextureInit(short width, short height, int type, int allocated, int flags, char* name, void** output)
 {
         //flags = (1 << 10);
@@ -90 +90 @@
 }
 
-short FLrHook_DebugNameShadeHack( Character* Char )
+short DD_Patch_DebugNameShadeHack( Character* Char )
 {
         return TSrContext_SetShade(*(void**)(OniExe + 0x001EB844), ONrCharacter_GetHealthShade( Char->Health, Char->MaxHealth ));
@@ -244 +244 @@
 }
 
+// Enable flatline multiplayer code
+void DD_Patch_Flatline()
+{
+        DDrPatch_NOOP((char*)(OniExe + 0x000E1957), 6 );
+        DDrPatch_MakeCall((void*)(OniExe + 0x000E17F6), FLrHook_Lasers );
+
+        
+        //Flatline related stuff
+        DDrPatch_MakeCall((void*)(OniExe + 0x000FBCEA), DDrText_Hook);
+        
+        DDrPatch_Int32((int*)(OniExe + 0x000B24D2), FLrSpawnHack);
+
+        DDrPatch_NOOP((char*)(OniExe + 0x000C26CB), 6);
+
+        DDrPatch_MakeCall((void*)(OniExe + 0x000C26CB), FLrHook_DoorOpen); 
+        DDrPatch_MakeCall((void*)(OniExe + 0x000EE3CF), FLrHook_ConsoleActivate);
+}
+
 // Font texture cache doubled
 void DD_Patch_FontTextureCache()
@@ -455 +473 @@
         DDrPatch_Byte((char*)(OniExe + 0x0008C899), 0xCE );
 
-        DDrPatch_MakeCall((void*)(OniExe + 0x0008C8A3), FLrHook_DebugNameShadeHack);
+        DDrPatch_MakeCall((void*)(OniExe + 0x0008C8A3), DD_Patch_DebugNameShadeHack);
         
         //Make the background black for additive blending
-        DDrPatch_MakeCall((void*)(OniExe + 0x0008C802), FLrHook_DebugNameTextureInit );
+        DDrPatch_MakeCall((void*)(OniExe + 0x0008C802), DD_Patch_DebugNameTextureInit );
 */
 }
@@ -499 +517 @@
                 DD_Patch_DaodanDisplayEnum();
         
-        if (patch_daodaninit)
-                DD_Patch_DaodanInit();
-        
         if (patch_directinput)
                 DD_Patch_DirectInput();
@@ -560 +575 @@
 
 
+        DD_Patch_DaodanInit();
+        
         DD_Patch_GammaSlider();
 
@@ -567 +584 @@
         DD_Patch_ShowNames();
 
-#ifdef FLATLINE
-        DDrPatch_NOOP((char*)(OniExe + 0x000E1957), 6 );
-        DDrPatch_MakeCall((void*)(OniExe + 0x000E17F6), FLrHook_Lasers );
-        
-
-
-        //Flatline related stuff
-        DDrPatch_MakeCall((void*)(OniExe + 0x000FBCEA), DDrText_Hook);
-        
-        DDrPatch_Int32((int*)(OniExe + 0x000B24D2), FLrSpawnHack);
-
-        DDrPatch_NOOP((char*)(OniExe + 0x000C26CB), 6);
-
-        DDrPatch_MakeCall((void*)(OniExe + 0x000C26CB), FLrHook_DoorOpen); 
-        DDrPatch_MakeCall((void*)(OniExe + 0x000EE3CF), FLrHook_ConsoleActivate);
-#endif
+        if (patch_flatline)
+                DD_Patch_Flatline();
 
         return true;