--- Daodan/src/Daodan.c	2009/06/10 12:40:16	349
+++ Daodan/src/Daodan.c	2009/07/26 12:04:44	451
@@ -6,6 +6,7 @@
 #include "Daodan_Win32.h"
 #include "Daodan_Cheater.h"
 #include "Daodan_Persistence.h"
+#include "Daodan_BSL.h"
 
 #include "Daodan_WindowHack.h"
 
@@ -34,8 +35,9 @@ bool patch_cooldowntimer = true;
 bool patch_throwtest = false;
 bool patch_alttab = true;
 bool patch_particledisablebit = false;
-bool patch_multibyte = true;
+bool patch_multibyte = false;
 bool patch_cheattable = true;
+bool patch_argb8888 = true;
 
 bool patch_safeprintf = true;
 bool patch_daodandisplayenum = true;
@@ -43,6 +45,10 @@ 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 opt_usedaodanbsl = true;
 
 bool DDrPatch_Init()
 {
@@ -127,7 +133,7 @@ bool DDrPatch_Init()
 		DDrPatch_Int16 (OniExe + 0x001b184, 0x9090);
 	
 	// Multi-byte patch (multiple language support)
-	if (patch_multibyte)
+	if (!patch_multibyte)
 	{
 		DDrPatch_Byte  (OniExe + 0x0002d8f8, 0xeb);
 		DDrPatch_Byte  (OniExe + 0x0002d9ad, 0xeb);
@@ -154,17 +160,27 @@ bool DDrPatch_Init()
 		DDrPatch_Int32 (OniExe + 0x000f617a, (int)&DDr_CheatTable[0].message_on);
 	}
 	
+	if (patch_argb8888)
+	{
+		DDrPatch_Byte  (OniExe + 0x00135af0, 0x07);
+		DDrPatch_Byte  (OniExe + 0x00135af4, 0x0B);
+	}
+	
 	return true;
 }
 
-enum {s_unknown, s_patch, s_language} ini_section;
+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)
 	{
-		if (!stricmp(section, "patch"))
+		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
@@ -176,47 +192,57 @@ bool DDrIniCallback(char* section, bool
 	
 	switch (ini_section)
 	{
+		case s_options:
+			if (!stricmp(name, "usedaodanbsl"))
+				opt_usedaodanbsl = !stricmp(inifile_cleanstr(value), "true");
+			break;
 		case s_patch:
 			if (!stricmp(name, "fonttexturecache"))
-				patch_fonttexturecache = !stricmp(value, "true");
+				patch_fonttexturecache = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "largetextures"))
-				patch_largetextures = !stricmp(value, "true");
+				patch_largetextures = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "levelplugins"))
-				patch_levelplugins = !stricmp(value, "true");
+				patch_levelplugins = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "pathfinding"))
-				patch_pathfinding = !stricmp(value, "true");
+				patch_pathfinding = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "projaware"))
-				patch_projaware = !stricmp(value, "true");
+				patch_projaware = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "directinput"))
-				patch_directinput = !stricmp(value, "true");
+				patch_directinput = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "wpfadetime"))
-				patch_wpfadetime = !stricmp(value, "true");
+				patch_wpfadetime = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "kickguns"))
-				patch_kickguns = !stricmp(value, "true");
+				patch_kickguns = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "cooldowntimer"))
-				patch_cooldowntimer = !stricmp(value, "true");
+				patch_cooldowntimer = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "throwtest"))
-				patch_throwtest = !stricmp(value, "true");
+				patch_throwtest = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "alttab"))
-				patch_alttab = !stricmp(value, "true");
+				patch_alttab = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "particledisablebit"))
-				patch_particledisablebit = !stricmp(value, "true");
+				patch_particledisablebit = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "multibyte"))
-				patch_multibyte = !stricmp(value, "true");
+				patch_multibyte = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "cheattable"))
-				patch_cheattable = !stricmp(value, "true");
+				patch_cheattable = !stricmp(inifile_cleanstr(value), "true");
+			else if (!stricmp(name, "argb8888"))
+				patch_argb8888 = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "safeprintf"))
-				patch_safeprintf = !stricmp(value, "true");
+				patch_safeprintf = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "daodandisplayenum"))
-				patch_daodandisplayenum = !stricmp(value, "true");
+				patch_daodandisplayenum = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "usegettickcount"))
-				patch_usegettickcount = !stricmp(value, "true");
+				patch_usegettickcount = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "cheatsenabled"))
-				patch_cheatsenabled = !stricmp(value, "true");
+				patch_cheatsenabled = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "usedaodangl"))
-				patch_usedaodangl = !stricmp(value, "true");
+				patch_usedaodangl = !stricmp(inifile_cleanstr(value), "true");
 			else if (!stricmp(name, "windowhack"))
-				patch_windowhack = !stricmp(value, "true");
+				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
 				DDrStartupMessage("unrecognised patch \"%s\"", name);
 			break;
@@ -328,6 +354,7 @@ bool DDrIniCallback(char* section, bool
 			else
 				DDrStartupMessage("unrecognised language item \"%s\"", name);
 			break;
+		case s_bsl:
 		default:
 			break;
 	}
@@ -354,6 +381,12 @@ void DDrConfig()
 	DDrStartupMessage("finished parsing");
 }
 
+void ONICALL DDrGame_Init()
+{
+	if (opt_usedaodanbsl)
+		SLrDaodan_Initalize();
+}
+
 void __cdecl DDrMain(int argc, char* argv[])
 {
 	DDrStartupMessage("daodan attached!");
@@ -391,6 +424,13 @@ void __cdecl DDrMain(int argc, char* arg
 	if (patch_windowhack)
 		DDrWindowHack_Install();
 	
+	if (patch_daodaninit)
+		DDrPatch_MakeCall(OniExe + 0x000d345a, DDrGame_Init);
+	
+	// Patches for existing BSL functions
+	if (patch_bsl)
+		SLrDaodan_Patch();
+	
 	init_daodan_gl();
 	
 	ONiMain(argc, argv);