--- Daodan/src/Daodan.c	2009/03/17 12:12:24	274
+++ Daodan/src/Daodan.c	2014/04/05 10:19:11	992
@@ -1,70 +1,72 @@
+#include <windows.h>
+#include <string.h>
+#include <stdio.h>
+#include <time.h>
+
 #include "Daodan.h"
 #include "Daodan_Patch.h"
 #include "Daodan_Utility.h"
+#include "Daodan_Cheater.h"
+#include "Daodan_BSL.h"
+#include "Daodan_Console.h"
+#include "Daodan_Config.h"
+#include "patches/Patches.h"
+#include "bink-proxy.h"
+#include "_Version.h"
 
-#include "Oni.h"
-#include "BFW_Utility.h"
+#include "Oni/Oni.h"
 
 HMODULE DDrDLLModule;
 HMODULE DDrONiModule;
 
-bool DDrPatch_Init()
-{
-	// Font texture cache doubled
-	DDrPatch_Byte  (OniExe + 0x00020ea7, 0x20);
-	DDrPatch_Byte  (OniExe + 0x00020f4a, 0x40);
-	
-	// Now supports textures up to 512x512
-	DDrPatch_Byte  (OniExe + 0x00005251, 0x10);
-	
-	// Non-"_Final" levels are now valid
-	DDrPatch_Byte  (OniExe + 0x000206a8, 0x01);
-	
-	// Pathfinding grid cache size x8
-	DDrPatch_Byte  (OniExe + 0x0010b03b, 0x20);
-	DDrPatch_Byte  (OniExe + 0x0010b04c, 0x20);
-	
-	// Projectile awareness fixed
-	DDrPatch_Byte  (OniExe + 0x0009c07c, 0x6c);
-	DDrPatch_Byte  (OniExe + 0x0009c080, 0x70);
-	DDrPatch_Byte  (OniExe + 0x0009c084, 0x74);
-	DDrPatch_Byte  (OniExe + 0x0009c110, 0x6c);
-	
-	// Forced DirectInput (for Windows NT)
-	DDrPatch_Byte  (OniExe + 0x00002e6d, 0xeb);
-	
-	// Makes wp_fadetime actually have a function
-	const char fadetime_patch[] = { 0x66, 0x8B, 0x1D, 0xC4, 0x7D, 0x62, 0x00, 0x66, 0x89, 0x5E, 0x46, 0x5B, 0x5E, 0x83, 0xC4, 0x14, 0xC3 };
-	DDrPatch_Const (OniExe + 0x0011a889, fadetime_patch);
-	DDrPatch_Byte  (OniExe + 0x0011a560, 0x31);
-	
-	// Sets the fadetime to 4800 by default
-	DDrPatch_Int16 (OniExe + 0x0011ab0e, 0x12c0);
-	
-	// Hackish fix for Konoko not kicking guns
-	const char kickgun_patch[] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0xC7, 0x05, 0x1C, 0xC9, 0x5E, 0x00, 0x70, 0xB8, 0x43, 0x00, 0xC7, 0x05, 0x20, 0xC9, 0x5E, 0x00, 0x20, 0xBE, 0x43 };
-	DDrPatch_Const (OniExe + 0x000dc420, kickgun_patch);
-	
-	// Cooldown timer exploit fix ^_^
-	const char cooldown_patch[] = { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 };
-	DDrPatch_Const (OniExe + 0x0011a825, cooldown_patch);
-	
-//	const char throwtest_patch[] = { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 };
-//	DDrPatch_Const(OniExe + 0x000dc190, throwtest_patch);
-	
-	return true;
-}
-
 void __cdecl DDrMain(int argc, char* argv[])
 {
-	DDrPatch_Init();
-	
-	// Safe startup message printer
-	DDrPatch_MakeJump(UUrStartupMessage, DDrStartupMessage);
+	time_t rawtime;
+	struct tm* timeinfo;
+	char buffer[80];
+	time(&rawtime);
+	timeinfo = localtime(&rawtime);
+	strftime(buffer, 80, "Daodan: %Y-%m-%d %H:%M:%S", timeinfo);
+
+	DDrStartupMessage("Daodan: Daodan v."DAODAN_VERSION_STRING" attached!");
+	DDrStartupMessage(buffer);
 	
+	DDrConfig(argc, argv);
+
+	if(GetKeyState(VK_SHIFT) & 0x8000) {
+		DDrStartupMessage("Daodan: Shift");
+		guitest(DDrONiModule);
+	}
+
+	DD_Patch_Init();
+
+	BinkProxyInit();
+
 	ONiMain(argc, argv);
 }
-
+/*
+void DDrWrongExe()
+{
+	switch (MessageBox(NULL, "This version of the Daodan DLL is incompatible with your Oni.exe.\n"
+		"Click OK for more information. To continue using Oni without the patch, replace the downloaded binkw32.dll with the original.", "Daodan", MB_OKCANCEL | MB_ICONERROR))
+	{
+		case IDOK:
+			{
+				STARTUPINFO si;
+				PROCESS_INFORMATION pi;
+				FillMemory(&si, 0, sizeof(si));
+				FillMemory(&pi, 0, sizeof(pi));
+				si.cb = sizeof(si);
+				if (!CreateProcess(NULL, "cmd /c \"start http://wiki.oni2.net/Daodan_DLL\"", NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
+					MessageBox(NULL, "", "", 0);
+				CloseHandle(pi.hProcess);
+				CloseHandle(pi.hThread);
+			}
+		default:
+			ExitProcess(0);
+	}
+}
+*/
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
 {
 	switch (fdwReason)
@@ -73,8 +75,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,
 			DDrDLLModule = hinstDLL;
 			DDrONiModule = GetModuleHandle(NULL);
 			
-			DDrPatch_MakeCall(OniExe + 0x0010fb49, DDrMain);
-			
+			if (*(uint32_t*)(OniExe + 0x0011acd0) == 0x09d36852)
+				DDrPatch_MakeCall((void*)(OniExe + 0x0010fb49), (void*)DDrMain);
+			else
+				ExitProcess(0);
 			break;
 	}
 	return TRUE;