Changeset 876

Timestamp:

Jun 1, 2013, 10:29:59 PM (11 years ago)

Author:

gumby

Message:

Daodan pass 1

Location:

Daodan

Files:

• makefile (modified) (1 diff)
• src/Daodan_BSL.c (modified) (2 diffs)
• src/Flatline.c (added)
• src/Flatline.h (added)
• src/Flatline_BSL.c (added)
• src/Flatline_BSL.h (added)
• src/Flatline_Client.c (added)
• src/Flatline_Client.h (added)
• src/Flatline_Events.c (added)
• src/Flatline_Events.h (added)
• src/Flatline_Hooks.c (added)
• src/Flatline_Hooks.h (added)
• src/Flatline_Net.c (added)
• src/Flatline_Net.h (added)
• src/Flatline_Packet.c (added)
• src/Flatline_Packet.h (added)
• src/Flatline_PacketBuilder.c (added)
• src/Flatline_PacketReader.c (added)
• src/Flatline_Public.h (added)
• src/Flatline_Server.c (added)
• src/Flatline_Server.h (added)
• src/Flatline_Win32.c (added)
• src/Flatline_Win32.h (added)
• src/Mariusnet.c (added)
• src/Mariusnet_Defs.h (added)
• src/Mariusnet_Public.h (added)
• src/Oni_Symbols.h (modified) (2 diffs)
• src/patches/Patches.c (modified) (2 diffs)

Daodan/makefile

@@ -8 +8 @@
 endif
 
-GCCFLAGS = -std=c99 -O0 -Wall -fomit-frame-pointer -fpack-struct -Wextra -Wno-unused-variable -Wno-unused-parameter
+DEF = NOFLATLINE
+GCCFLAGS = -std=c99 -O0 -Wall -fomit-frame-pointer -fpack-struct -Wextra -Wno-unused-variable -Wno-unused-parameter -D $(DEF)
 LINKFLAGS = -O0 -Wall -fomit-frame-pointer -fpack-struct -s -mdll
 LOCALE = LC_MESSAGES=C
 
 #LIBS = -lwinmm -lopengl32 -lgdi32
-LIBS = -lgdi32
-OBJS = src/binkw32.def
+LIBS = -lgdi32 -lwsock32
+OBJS = src/binkw32.def 
 OUT = build/binkw32.dll
 
 FOLDERS = patches
-SRC = src/Daodan.c src/Daodan_BSL.c src/Daodan_Character.c src/Daodan_Cheater.c src/Daodan_Config.c src/Daodan_Console.c src/Daodan_GL.c src/Daodan_Patch.c src/Daodan_Persistence.c src/Daodan_Utility.c src/Daodan_Win32.c src/Inifile_Reader.c src/_DLLInfo.rc src/patches/Patches.c
+SRC = src/Daodan.c src/Daodan_BSL.c src/Daodan_Character.c src/Daodan_Cheater.c src/Daodan_Config.c src/Daodan_Console.c src/Daodan_GL.c src/Daodan_Patch.c src/Daodan_Persistence.c src/Daodan_Utility.c src/Daodan_Win32.c src/Inifile_Reader.c src/_DLLInfo.rc src/patches/Patches.c src/Flatline.c src/Flatline_BSL.c src/Flatline_Client.c src/Flatline_Hooks.c src/Flatline_Net.c src/Flatline_Packet.c src/Flatline_PacketReader.c src/Flatline_PacketBuilder.c src/Flatline_Server.c src/Flatline_Win32.c src/Mariusnet.c  src/Flatline_Events.c
 DEST = $(patsubst src/%.rc,build/%.o,$(patsubst src/%.c,build/%.o,$(SRC)))
+
 
 ALL: $(FOLDERS) $(DEST) $(OBJS)

Daodan/src/Daodan_BSL.c

@@ -821 +821 @@
 }
 
+extern void SLrFlatline_Initialize();
+
 void SLrDaodan_Initialize()
 {
@@ -857 +859 @@
         SLrScript_Command_Register_ReturnType("st", "Prints to console in color", "", sl_void, bsl_dprintcolored);
         SLrScript_Command_Register_ReturnType("d_dprint", "Prints to console in color", "", sl_void, bsl_dprintcolored);
+
+#ifdef FLATLINE
+        SLrFlatline_Initialize();
+#endif
 }
 

Daodan/src/Oni_Symbols.h

@@ -1 @@
-#ifndef ONI_SYMBOLS_H 
+#ifndef ONI_SYMBOLS_H
 #define ONI_SYMBOLS_H
 #include "stdint.h"
@@ -34 +34 @@
 // Game termination flag (ONiRunGame loops on it).
 #define ONgTerminateGame        (*((UUtBool*)0x00630ffd))
- 
+
 // Window manager is running (drawing and updating windows).
 #define WMgActive                       (*((UUtBool*)0x005e99a0))
- 
+
 // Set by WinMain, used by UUrPlatform_Initialize and ONrPlatform_Initialize,
 // which copies it into ONgPlatformData.
 #define ONgInstance                     (*((HINSTANCE*)0x0061f9e4))
- 
+
 // Keeps initial gamma ramp value (before any change).
 #define GLgInitialGammaRamp     (((M3tWin32GammaRamp*)0x0055fdfc))

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 "../Oni.h"
 
@@ -561 +564 @@
         DD_Patch_PrintWarning();
 
+
         DD_Patch_ShowNames();
 
-        if(1)
-        {
-                //DDrPatch_NOOP((char*)(OniExe + 0x000E1957), 6 );
-                //DDrPatch_MakeCall((void*)(OniExe + 0x000E17F6), FLrHook_Lasers );
-        }
+#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);
-        
-//FLATLINE?     DDrPatch_Int32((int*)(OniExe + 0x000B24D2), FLrSpawnHack);
-
-//FLATLINE?     DDrPatch_NOOP((char*)(OniExe + 0x000C26CB), 6);
-
-//FLATLINE?     DDrPatch_MakeCall((void*)(OniExe + 0x000C26CB), FLrHook_DoorOpen); 
-//FLATLINE?     DDrPatch_MakeCall((void*)(OniExe + 0x000EE3CF), FLrHook_ConsoleActivate);
-
+        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
 
         return true;