--- Daodan/src/Daodan.c	2013/03/06 18:33:15	690
+++ Daodan/src/Daodan.c	2013/04/29 16:29:16	838
@@ -1,4 +1,6 @@
+#include <windows.h>
 #include <string.h>
+#include <stdio.h>
 
 #include "Daodan.h"
 #include "Daodan_Patch.h"
@@ -8,59 +10,84 @@
 #include "Daodan_Persistence.h"
 #include "Daodan_BSL.h"
 #include "Daodan_Console.h"
-#include "Daodan_WindowHack.h"
+#include "Daodan_Config.h"
 
 #include "Oni.h"
-#include "Oni_Persistence.h"
-
-#include "BFW_Utility.h"
-
-#include "oni_gl.h"
-#include "daodan_gl.h"
 
-#include "inifile.h"
+#include "Oni_GL.h"
+#include "Daodan_GL.h"
 
 HMODULE DDrDLLModule;
 HMODULE DDrONiModule;
 
-bool patch_fonttexturecache = true;
-bool patch_largetextures = true;
-bool patch_levelplugins = true;
-bool patch_pathfinding = true;
-bool patch_projaware = true;
-bool patch_directinput = true;
-bool patch_wpfadetime = true;
-bool patch_kickguns = false;
-bool patch_cooldowntimer = true;
-bool patch_throwtest = false;
-bool patch_alttab = true;
-bool patch_particledisablebit = false;
-bool patch_multibyte = false;
-bool patch_cheattable = true;
-bool patch_argb8888 = true;
-bool patch_killvtune = true;
-bool patch_getcmdline = true;
-bool patch_disablecmdline = true;
-
-bool patch_safeprintf = true;
-bool patch_daodandisplayenum = true;
-bool patch_usegettickcount = true;
-bool patch_cheatsenabled = true;
-bool patch_usedaodangl = false;
-bool patch_windowhack = true;
-bool patch_daodaninit = true;
-bool patch_bsl = true;
-bool patch_cheater = true;
-bool patch_newweapon = true;
-bool opt_usedaodanbsl = true;
-bool opt_border = true;
-bool opt_topmost = false;
+typedef int (__cdecl *CHINESEPROC)(DWORD ThreadId); 
+
+// Hooked WMrSlider_SetRange() in ONiOGU_Options_InitDialog. Disables a gamma
+// slider in windowed mode.
+static void ONICALL DD_ONiOGU_GammaSlider_SetRange(WMtWindow* window, int min_value, int max_value)
+{
+	WMrWindow_SetEnabled(window, M3gResolutionSwitch && opt_gamma);
+	WMrSlider_SetRange(window, min_value, max_value);
+}
+ 
+void ONICALL DDrShowResumeButton(WMtWindow* window, int visibility)
+{
+	if (visibility)
+		WMrWindow_SetLocation(window, 150, 350);
+	WMrWindow_SetVisible(window, visibility);
+}
+
+
+/* Options always visible patch */
+void ONICALL DDrShowOptionsButton(WMtWindow* window, int visibility)
+{
+	WMrWindow_SetVisible(window, 1);
+}
+
+void ONICALL DDrGame_Init()
+{
+	if (opt_usedaodanbsl)
+		SLrDaodan_Initialize();
+}
+
+
+//this was broken 
+FILE** _UUgError_WarningFile = (FILE**)0x005711B4;
+FILE *__fastcall DDrPrintWarning(int filename, int linenumber, unsigned __int16 errornum, int message)
+{
+
+	FILE *v4; // eax@1
+	FILE *result; // eax@4
+	char v6[512]; // [sp+0h] [bp-100h]@1
+	FILE* UUgError_WarningFile = *_UUgError_WarningFile;
+
+	if (filename && message && (strlen((const char*)filename)+strlen((const char*)message))<420) {
+		sprintf(
+			v6,
+			"Error %x reported from File: %s, Line: %d (message follows) \r\n%s",
+			errornum,
+			(const char*)filename,
+			linenumber,
+			(const char*)message);
+
+		if ( UUgError_WarningFile 
+			|| (UUgError_WarningFile = oni_fopen("debugger.txt", "wb"), UUgError_WarningFile ) )
+		{ 
+			oni_fprintf(UUgError_WarningFile, "%s\r\n", v6);
+			oni_fflush(UUgError_WarningFile);
+		}
+	}
+	//oni_fprintf(stdout, v6);
+	//sprintf(&v6, "%s", message);
+	*_UUgError_WarningFile = UUgError_WarningFile;
+	result = UUgError_WarningFile;
+	return result; 
+}
+
 
-typedef int (__cdecl *CHINESEPROC)(DWORD WINAPI); 
-bool patch_chinese = false;
 bool DDrPatch_Init()
 {
-	DDrStartupMessage("patching engine");
+	DDrStartupMessage("Daodan: Patching engine");
 	
 	// Font texture cache doubled
 	if (patch_fonttexturecache)
@@ -189,7 +216,7 @@ bool DDrPatch_Init()
 	//Test newweap patch
 	if (patch_newweapon) {
 		
-		//Makes it always say "Recieved weapon_name."
+		//Makes it always say "Received weapon_name."
 		//Needs check for loc_4DFC66
 		//DDrPatch_NOOP((char*)(OniExe + 0x000E4DF8),2);
 
@@ -236,13 +263,25 @@ bool DDrPatch_Init()
 	
 	if(patch_chinese)
 	{
-		HMODULE dll = LoadLibrary("xfhsm_oni.dll");
-		if( dll )
+		if (GetFileAttributes("xfhsm_oni.dll") != INVALID_FILE_ATTRIBUTES)
 		{
-			void* proc = GetProcAddress( dll, "InstallHook" );
-			if(proc)
+			HMODULE dll;
+			DWORD err;
+
+	 		DDrStartupMessage("Daodan: Loading chinese DLL");
+			dll = LoadLibrary("xfhsm_oni.dll");
+			err = GetLastError();
+			if( dll )
 			{
-				((CHINESEPROC)proc)(GetCurrentThreadId());
+				void* proc = GetProcAddress( dll, "InstallHook" );
+				if(proc)
+				{
+					((CHINESEPROC)proc)(GetCurrentThreadId());
+				}
+			} else {
+				char msg[100];
+				FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, 0, msg, 100, NULL);
+				DDrStartupMessage("Daodan: Loading DLL failed with error %i: %s", err, msg);
 			}
 		}
 	}
@@ -281,360 +320,39 @@ bool DDrPatch_Init()
 
 //FLATLINE?	DDrPatch_MakeCall((void*)(OniExe + 0x000C26CB), FLrHook_DoorOpen); 
 //FLATLINE?	DDrPatch_MakeCall((void*)(OniExe + 0x000EE3CF), FLrHook_ConsoleActivate);
-	return true;
-}
 
-enum {s_unknown, s_options, s_patch, s_bsl, s_language} ini_section;
 
-bool DDrIniCallback(char* section, bool newsection, char* name, char* value)
-{
-	if (newsection)
+	// Fix options not visible in main menu when a game was started
+	if(patch_optionsvisible)
 	{
-		if (!_stricmp(section, "options"))
-			ini_section = s_options;
-		else if (!_stricmp(section, "patch"))
-			ini_section = s_patch;
-		else if (!_stricmp(section, "bsl"))
-			ini_section = s_bsl;
-		else if (!_stricmp(section, "language"))
-			ini_section = s_language;
-		else
-		{
-			ini_section = s_unknown;
-			DDrStartupMessage("unrecognised section \"%s\"", section);
-		}
-	}
-	
-	switch (ini_section)
-	{
-		case s_options:
-			if (!_stricmp(name, "usedaodanbsl"))
-				opt_usedaodanbsl = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "border"))
-				opt_border = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "topmost"))
-				opt_topmost = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "multibyte"))
-				patch_multibyte = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "debug"))
-				AKgDebug_DebugMaps = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "debugfiles"))
-				BFgDebugFileEnable = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "findsounds"))
-				SSgSearchOnDisk = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "ignore_private_data"))
-				opt_ignore_private_data = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "sound"))
-				opt_sound = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "switch"))
-				M3gResolutionSwitch = !_stricmp(inifile_cleanstr(value), "true");
-			//else if (!_stricmp(name, "devmode"))
-				//turn_dev_mode_on = !_stricmp(inifile_cleanstr(value), "true");
-			else
-				DDrStartupMessage("unrecognised option \"%s\"", name);
-			break;
-		case s_patch:
-			if (!_stricmp(name, "fonttexturecache"))
-				patch_fonttexturecache = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "largetextures"))
-				patch_largetextures = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "levelplugins"))
-				patch_levelplugins = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "pathfinding"))
-				patch_pathfinding = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "projaware"))
-				patch_projaware = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "directinput"))
-				patch_directinput = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "wpfadetime"))
-				patch_wpfadetime = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "kickguns"))
-				patch_kickguns = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "cooldowntimer"))
-				patch_cooldowntimer = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "throwtest"))
-				patch_throwtest = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "alttab"))
-				patch_alttab = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "particledisablebit"))
-				patch_particledisablebit = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "multibyte"))
-				patch_multibyte = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "cheattable"))
-				patch_cheattable = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "argb8888"))
-				patch_argb8888 = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "killvtune"))
-				patch_killvtune = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "getcmdline"))
-				patch_getcmdline = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "disablecmdline"))
-				patch_disablecmdline = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "safeprintf"))
-				patch_safeprintf = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "daodandisplayenum"))
-				patch_daodandisplayenum = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "usegettickcount"))
-				patch_usegettickcount = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "cheatsenabled"))
-				patch_cheatsenabled = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "usedaodangl"))
-				patch_usedaodangl = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "windowhack"))
-				patch_windowhack = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "daodaninit"))
-				patch_daodaninit = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "bsl"))
-				patch_bsl = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "cheater"))
-				patch_cheater = !_stricmp(inifile_cleanstr(value), "true");
-			else if (!_stricmp(name, "newweap"))
-				patch_newweapon = !_stricmp(inifile_cleanstr(value), "true");
-			else
-				DDrStartupMessage("unrecognised patch \"%s\"", name);
-			break;
-		case s_language:
-			if (!_stricmp(name, "chinese"))
-				patch_chinese = true;
-			else if (!_stricmp(name, "savepoint"))
-			{
-				char* str = _strdup(value);
-				DDrPatch_Int32((int*)(OniExe + 0x000fd730), (int)str);
-				DDrPatch_Int32((int*)(OniExe + 0x000fd738), (int)str);
-			}
-			else if (!_stricmp(name, "syndicatewarehouse"))
-			{
-				char* str = _strdup(value);
-				DDrPatch_Int32((int*)(OniExe + 0x000fd71a), (int)str);
-				DDrPatch_Int32((int*)(OniExe + 0x0010ef75), (int)str);
-			}
-			else if (!_stricmp(name, "damn"))
-				DDrPatch__strdup((int*)(OniExe + 0x0010fb6e), value);
-			else if (!_stricmp(name, "blam"))
-				DDrPatch__strdup((int*)(OniExe + 0x0010fb73), value);
-			else if (!_stricmp(name, "shapeshifter_on"))
-				DDr_CheatTable[0].message_on = _strdup(value);
-			else if (!_stricmp(name, "shapeshifter_off"))
-				DDr_CheatTable[0].message_off = _strdup(value);
-			else if (!_stricmp(name, "liveforever_on"))
-				DDr_CheatTable[1].message_on = _strdup(value);
-			else if (!_stricmp(name, "liveforever_off"))
-				DDr_CheatTable[1].message_off = _strdup(value);
-			else if (!_stricmp(name, "touchofdeath_on"))
-				DDr_CheatTable[2].message_on = _strdup(value);
-			else if (!_stricmp(name, "touchofdeath_off"))
-				DDr_CheatTable[2].message_off = _strdup(value);
-			else if (!_stricmp(name, "canttouchthis_on"))
-				DDr_CheatTable[3].message_on = _strdup(value);
-			else if (!_stricmp(name, "canttouchthis_off"))
-				DDr_CheatTable[3].message_off = _strdup(value);
-			else if (!_stricmp(name, "fatloot_on"))
-				DDr_CheatTable[4].message_on = _strdup(value);
-			else if (!_stricmp(name, "glassworld_on"))
-				DDr_CheatTable[5].message_on = _strdup(value);
-			else if (!_stricmp(name, "glassworld_off"))
-				DDr_CheatTable[5].message_off = _strdup(value);
-			else if (!_stricmp(name, "winlevel_on"))
-				DDr_CheatTable[6].message_on = _strdup(value);
-			else if (!_stricmp(name, "loselevel_on"))
-				DDr_CheatTable[7].message_on = _strdup(value);
-			else if (!_stricmp(name, "bighead_on"))
-				DDr_CheatTable[8].message_on = _strdup(value);
-			else if (!_stricmp(name, "bighead_off"))
-				DDr_CheatTable[8].message_off = _strdup(value);
-			else if (!_stricmp(name, "minime_on"))
-				DDr_CheatTable[9].message_on = _strdup(value);
-			else if (!_stricmp(name, "minime_off"))
-				DDr_CheatTable[9].message_off = _strdup(value);
-			else if (!_stricmp(name, "superammo_on"))
-				DDr_CheatTable[10].message_on = _strdup(value);
-			else if (!_stricmp(name, "superammo_off"))
-				DDr_CheatTable[10].message_off = _strdup(value);
-			else if (!_stricmp(name, "devmode_on"))
-			{
-				char* str = _strdup(value);
-				DDr_CheatTable[11].message_on = str;
-				DDr_CheatTable[cheat_x].message_on = str;
-			}
-			else if (!_stricmp(name, "devmode_off"))
-			{
-				char* str = _strdup(value);
-				DDr_CheatTable[11].message_off = str;
-				DDr_CheatTable[cheat_x].message_off = str;
-			}
-			else if (!_stricmp(name, "reservoirdogs_on"))
-				DDr_CheatTable[12].message_on = _strdup(value);
-			else if (!_stricmp(name, "reservoirdogs_off"))
-				DDr_CheatTable[12].message_off = _strdup(value);
-			else if (!_stricmp(name, "roughjustice_on"))
-				DDr_CheatTable[13].message_on = _strdup(value);
-			else if (!_stricmp(name, "roughjustice_off"))
-				DDr_CheatTable[13].message_off = _strdup(value);
-			else if (!_stricmp(name, "chenille_on"))
-				DDr_CheatTable[14].message_on = _strdup(value);
-			else if (!_stricmp(name, "chenille_off"))
-				DDr_CheatTable[14].message_off = _strdup(value);
-			else if (!_stricmp(name, "behemoth_on"))
-				DDr_CheatTable[15].message_on = _strdup(value);
-			else if (!_stricmp(name, "behemoth_off"))
-				DDr_CheatTable[15].message_off = _strdup(value);
-			else if (!_stricmp(name, "elderrune_on"))
-				DDr_CheatTable[16].message_on = _strdup(value);
-			else if (!_stricmp(name, "elderrune_off"))
-				DDr_CheatTable[16].message_off = _strdup(value);
-			else if (!_stricmp(name, "moonshadow_on"))
-				DDr_CheatTable[17].message_on = _strdup(value);
-			else if (!_stricmp(name, "moonshadow_off"))
-				DDr_CheatTable[17].message_off = _strdup(value);
-			else if (!_stricmp(name, "munitionfrenzy_on"))
-				DDr_CheatTable[18].message_on = _strdup(value);
-			else if (!_stricmp(name, "fistsoflegend_on"))
-				DDr_CheatTable[19].message_on = _strdup(value);
-			else if (!_stricmp(name, "fistsoflegend_off"))
-				DDr_CheatTable[19].message_off = _strdup(value);
-			else if (!_stricmp(name, "killmequick_on"))
-				DDr_CheatTable[20].message_on = _strdup(value);
-			else if (!_stricmp(name, "killmequick_off"))
-				DDr_CheatTable[20].message_off = _strdup(value);
-			else if (!_stricmp(name, "carousel_on"))
-				DDr_CheatTable[21].message_on = _strdup(value);
-			else if (!_stricmp(name, "carousel_off"))
-				DDr_CheatTable[21].message_off = _strdup(value);
-			else
-				DDrStartupMessage("unrecognised language item \"%s\"", name);
-			break;
-		case s_bsl:
-		default:
-			break;
+		DDrPatch_MakeCall((void*)(OniExe + 0x000d2d2d), DDrShowOptionsButton);
+		DDrPatch_MakeCall((void*)(OniExe + 0x000d2d43), DDrShowResumeButton);
 	}
-	
-	return true;
-}
 
-void DDrConfig()
-{
-
-	if (GetFileAttributes("daodan.ini") == INVALID_FILE_ATTRIBUTES)
+	// Fix BinkBufferInit() call in BKrMovie_Play() to use GDI (DIB) blitting
+	// instead of DirectDraw; patch ONiRunGame to use the same method to play
+	// outro (ie., BKrMovie_Play() instead of ONrMovie_Play_Hardware() as the
+	// latter has problems on WINE).
+	if (patch_binkplay)
 	{
-		FILE* fp;
-		DDrStartupMessage("daodan.ini doesn't exist, creating");
-		fp = fopen("daodan.ini", "w");
-		if (fp)
-		{
-			fputs("[Options]\n", fp);
-			fclose(fp);
-		}
+		// push BINKBUFFERAUTO -> push BINKBUFFERDIBSECTION.
+		DDrPatch_Byte((void*)(OniExe + 0x0008829b + 1), 0x02);
+		// call ONrMovie_Play_Hardware -> call ONrMovie_Play
+		DDrPatch_MakeCall((void*)(OniExe + 0x000d496f), ONrMovie_Play);
 	}
-	
-	DDrStartupMessage("parsing daodan.ini...");
-	if (!inifile_read("daodan.ini", DDrIniCallback))
-		DDrStartupMessage("error reading daodan.ini, check your syntax!");
-	DDrStartupMessage("finished parsing");
-}
-
-void ONICALL DDrGame_Init()
-{
-	if (opt_usedaodanbsl)
-		SLrDaodan_Initalize();
-}
 
-void DDrException() {
-	int* i = 0;
-	*i = 1;
-}
-#include <stdio.h>
+	// Patch a gamma slider in Options dialog (unconditionally).
+	// ONiOGU_Options_InitDialog: replace WMrSlider_SetRange(gammaSliderWindow, ...)
+	// call with our hook function.
+	DDrPatch_MakeCall((void*)(OniExe + 0x000d262c), (void*)DD_ONiOGU_GammaSlider_SetRange);
 
-//this was broken 
-FILE** _UUgError_WarningFile = (FILE**)0x005711B4;
-FILE *__fastcall DDrPrintWarning(int filename, int linenumber, unsigned __int16 errornum, int message)
-{
-
-	FILE *v4; // eax@1
-	FILE *result; // eax@4
-	char v6[512]; // [sp+0h] [bp-100h]@1
-	FILE* UUgError_WarningFile = *_UUgError_WarningFile;
-
-	if (filename && message && (strlen((const char*)filename)+strlen((const char*)message))<420) {
-		sprintf(
-			v6,
-			"Error %x reported from File: %s, Line: %d (message follows) \r\n%s",
-			errornum,
-			(const char*)filename,
-			linenumber,
-			(const char*)message);
-
-		if ( UUgError_WarningFile 
-			|| (UUgError_WarningFile = oni_fopen("debugger.txt", "wb"), UUgError_WarningFile ) )
-		{ 
-			oni_fprintf(UUgError_WarningFile, "%s\r\n", v6);
-			oni_fflush(UUgError_WarningFile);
-		}
-	}
-	//oni_fprintf(stdout, v6);
-	//sprintf(&v6, "%s", message);
-	*_UUgError_WarningFile = UUgError_WarningFile;
-	result = UUgError_WarningFile;
-	return result; 
-}
-
-void __cdecl DDrMain(int argc, char* argv[])
-{
-	int i;
-	char* section;
-	char* option;
-	bool falseoption;
-
-	DDrStartupMessage("daodan attached!");
-	
-	// Tell Oni to not load non levelX_final-files by default:
-	opt_ignore_private_data = false;
-
-	// Enable sound by default:
-	opt_sound = true;
-	
-	DDrConfig();
-	DDrStartupMessage("parsing command line...");
-	for (i = 1; i < argc; i ++)
-	{
-		if (argv[i][0] == '-')
-		{
-			section = argv[i] + 1;
-			if ((option = strchr(argv[i], '.')))
-			{
-				*option = '\0';
-				falseoption = (option[1] == 'n' || option[1] == 'N') && (option[2] = 'o' || option[2] == 'O');
-				if (i < (argc - 1) && argv[i + 1][0] != '-')
-					DDrIniCallback(section, true, option + 1, argv[++i]);
-				else
-					DDrIniCallback(section, true, option + (falseoption ? 3 : 1), (falseoption ? "false" : "true"));
-				*option = '.';
-			}
-			else
-			{
-				falseoption = (section[0] == 'n' || section[0] == 'N') && (section[1] = 'o' || section[1] == 'O');
-				ini_section = s_options;
-				if (i < (argc - 1) && argv[i + 1][0] != '-')
-					DDrIniCallback(NULL, false, section, argv[++i]);
-				else
-					DDrIniCallback(NULL, false, section + (falseoption ? 2 : 0), (falseoption ? "false" : "true"));
-			}
-		}
-		else
-		{
-			DDrStartupMessage("parse error \"%s\"", argv[i]);
-			break;
-		}
-	}
-	DDrStartupMessage("finished parsing");
-	DDrPatch_Init();
-	
 	// Safe startup message printer
 	if (patch_safeprintf)
 		DDrPatch_MakeJump((void*)UUrStartupMessage, (void*)DDrStartupMessage);
 	
 	// Daodan device mode enumeration function
 	if (patch_daodandisplayenum)
-		DDrPatch_MakeJump((void*)gl_enumerate_valid_display_modes, (void*)daodan_enumerate_valid_display_modes);
+		DDrPatch_MakeJump((void*)gl_enumerate_valid_display_modes, (void*)DD_GLrEnumerateDisplayModes);
 	
 	// Performance patch
 	if (patch_usegettickcount)
@@ -648,20 +366,55 @@ void __cdecl DDrMain(int argc, char* arg
 	if (patch_cheatsenabled)
 		DDrPatch_MakeJump((void*)ONrPersist_GetWonGame, (void*)DDrPersist_GetWonGame);
 
-	// Windowed mode
+	// DaodanGL with windowed mode support.
 	if (patch_usedaodangl)
 	{
-		DDrPatch_NOOP((char*)(OniExe + 0x000032B7), 6);
-		DDrPatch_MakeCall((void*)(OniExe + 0x000032B7), (void*)LIiP_SetCursorPosHook);
-	
-		DDrPatch_NOOP((char*)(OniExe + 0x00003349), 6);
-		DDrPatch_MakeCall((void*)(OniExe + 0x00003349), (void*)LIiP_SetCursorPosHook);
-		DDrPatch_MakeJump((void*)ONrPlatform_Initialize, (void*)DDrPlatform_Initialize);
-		DDrPatch_MakeJump((void*)gl_platform_initialize, (void*)daodangl_platform_initialize);
-	}
-	// Hacked windowed mode (for when daodangl isn't working properly)
-	else if (patch_windowhack)
-		DDrWindowHack_Install();
+		// LIrPlatform_Mode_Set: GetWindowRect -> GetClientRect.
+		DDrPatch_NOOP((char*) OniExe + 0x00002dd6, 6);
+		DDrPatch_MakeCall((char*) OniExe + 0x00002dd6, (void*) GetClientRect);
+
+		// UUrWindow_GetSize: GetWindowRect -> GetClientRect.
+		DDrPatch_NOOP((char*) OniExe + 0x0002651c, 6);
+		DDrPatch_MakeCall((char*) OniExe + 0x0002651c, (void*) GetClientRect);
+
+		// LIrPlatform_PollInputForAction: fix GetCursorPos call to return client coordinates.
+		DDrPatch_NOOP((char*) OniExe + 0x000032cc, 6);
+		DDrPatch_MakeCall((char*) OniExe + 0x000032cc, (void*) DD_GetCursorPos);
+
+		// LIrPlatform_InputEvent_GetMouse: fix GetCursorPos call to return client coordinates.
+		DDrPatch_NOOP((char*) OniExe + 0x00002cc2, 6);
+		DDrPatch_MakeCall((char*) OniExe + 0x00002cc2, (void*) DD_GetCursorPos);
+
+		// LIrPlatform_PollInputForAction: translate SetCursorPos position to screen coordinates.
+		DDrPatch_NOOP((char*) OniExe + 0x000032b7, 6);
+		DDrPatch_MakeCall((char*) OniExe + 0x000032b7, (void*) DD_SetCursorPos);
+
+		// LIrPlatform_PollInputForAction: translate SetCursorPos position to screen coordinates.
+		DDrPatch_NOOP((char*) OniExe + 0x00003349, 6);
+		DDrPatch_MakeCall((char*) OniExe + 0x00003349, (void*) DD_SetCursorPos);
+
+		// Replace ONrPlatformInitialize.
+		DDrPatch_MakeJump((void*) ONrPlatform_Initialize, (void*) DD_ONrPlatform_Initialize);
+
+		// Replace gl_platform_initialize.
+		DDrPatch_MakeJump((void*) gl_platform_initialize, (void*) DD_GLrPlatform_Initialize);
+
+		// Replace gl_platform_dispose.
+		DDrPatch_MakeJump((void *) gl_platform_dispose, (void*) DD_GLrPlatform_Dispose);
+ 	}
+
+	if (patch_clipcursor)
+	{
+		// LIrMode_Set: replace LIrPlatform_Mode_Set call with our hook.
+		DDrPatch_MakeCall((void*)(OniExe + 0x00003f9f), (void*) DD_LIrPlatform_Mode_Set);
+
+		// LIrMode_Set_Internal: replace LIrPlatform_Mode_Set call with our hook.
+		DDrPatch_MakeCall((void*)(OniExe + 0x00003fff), (void*) DD_LIrPlatform_Mode_Set);
+		
+		// LIrTermiante: replace LIrPlatform_Terminate call with our hook.
+		DDrPatch_MakeCall((void*)(OniExe + 0x000004cb8), (void*) DD_LIrPlatform_Terminate);
+	}
+
 	
 	if (patch_daodaninit)
 		DDrPatch_MakeCall((void*)(OniExe + 0x000d345a), (void*)DDrGame_Init);
@@ -680,11 +433,34 @@ void __cdecl DDrMain(int argc, char* arg
 		DDrPatch_MakeJump((void*)(OniExe + 0x0010f021), (void*)DDrCheater_LevelLoad);
 	}
 
-	//DDrPatch_MakeJump((void*)(OniExe + 0x000378c0, (void*)DDrException);
 	DDrPatch_MakeJump((void*)(OniExe + 0x000245A0), (void*)DDrPrintWarning);
-	//init_daodan_gl();
+
+
+	return true;
+}
+
+
+void DDrException() {
+	int* i = 0;
+	*i = 1;
+}
+
+void __cdecl DDrMain(int argc, char* argv[])
+{
+	DDrStartupMessage("Daodan: Daodan attached!");
+	
+	// Tell Oni to not load non levelX_final-files by default:
+	opt_ignore_private_data = false;
+
+	// Enable sound by default:
+	opt_sound = true;
+	
+	DDrConfig(argc, argv);
+
+	DDrPatch_Init();
+	
 	
- 	ONiMain(argc, argv);
+	ONiMain(argc, argv);
 }
 /*
 void DDrWrongExe()