ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/Daodan/src/Daodan.c

Comparing Daodan/src/Daodan.c (file contents):
Revision 473 by gumby, Fri Oct 30 07:41:39 2009 UTC vs.
Revision 690 by alloc, Wed Mar 6 18:33:15 2013 UTC

#	Line 7 | Line 7
7		#include "Daodan_Cheater.h"
8		#include "Daodan_Persistence.h"
9		#include "Daodan_BSL.h"
10	<
10	>	#include "Daodan_Console.h"
11		#include "Daodan_WindowHack.h"
12
13		#include "Oni.h"
#	Line 46 | Line 46 | bool patch_safeprintf = true;
46		bool patch_daodandisplayenum = true;
47		bool patch_usegettickcount = true;
48		bool patch_cheatsenabled = true;
49	<	bool patch_usedaodangl = true;
50	<	bool patch_windowhack = false;
49	>	bool patch_usedaodangl = false;
50	>	bool patch_windowhack = true;
51		bool patch_daodaninit = true;
52		bool patch_bsl = true;
53		bool patch_cheater = true;
54	–
54		bool patch_newweapon = true;
56	–
55		bool opt_usedaodanbsl = true;
56		bool opt_border = true;
59	–	bool opt_shadow = true;
57		bool opt_topmost = false;
58
59	+	typedef int (__cdecl *CHINESEPROC)(DWORD WINAPI);
60	+	bool patch_chinese = false;
61		bool DDrPatch_Init()
62		{
63		DDrStartupMessage("patching engine");
#	Line 66 | Line 65 | bool DDrPatch_Init()
65		// Font texture cache doubled
66		if (patch_fonttexturecache)
67		{
68	<	DDrPatch_Byte  (OniExe + 0x00020ea7, 0x20);
69	<	DDrPatch_Byte  (OniExe + 0x00020f4a, 0x40);
68	>	DDrPatch_Byte((char*)(OniExe + 0x00020ea7), 0x20);
69	>	DDrPatch_Byte((char*)(OniExe + 0x00020f4a), 0x40);
70		}
71
72		// Now supports textures up to 512x512
73		if (patch_largetextures)
74	<	DDrPatch_Byte  (OniExe + 0x00005251, 0x10);
74	>	DDrPatch_Byte  ((char*)(OniExe + 0x00005251), 0x10);
75
76		// Non-"_Final" levels are now valid
77		if (patch_levelplugins)
78	<	DDrPatch_Byte  (OniExe + 0x000206a8, 0x01);
78	>	DDrPatch_Byte  ((char*)(OniExe + 0x000206a8), 0x01);
79
80		// Pathfinding grid cache size x8
81		if (patch_pathfinding)
82		{
83	<	DDrPatch_Byte  (OniExe + 0x0010b03b, 0x20);
84	<	DDrPatch_Byte  (OniExe + 0x0010b04c, 0x20);
83	>	const unsigned char pathfinding[2] = {0x90 , 0xE9 };
84	>	DDrPatch_Byte  ((char*)(OniExe + 0x0010b03b), 0x20);
85	>	DDrPatch_Byte  ((char*)(OniExe + 0x0010b04c), 0x20);
86	>
87	>	//other stuff
88	>	DDrPatch_Const((char*)(OniExe + 0x00040789), pathfinding);
89		}
90
91		// Projectile awareness fixed
92		if (patch_projaware)
93		{
94	<	DDrPatch_Byte  (OniExe + 0x0009c07c, 0x6c);
95	<	DDrPatch_Byte  (OniExe + 0x0009c080, 0x70);
96	<	DDrPatch_Byte  (OniExe + 0x0009c084, 0x74);
97	<	DDrPatch_Byte  (OniExe + 0x0009c110, 0x6c);
94	>	DDrPatch_Byte  ((char*)(OniExe + 0x0009c07c), 0x6c);
95	>	DDrPatch_Byte  ((char*)(OniExe + 0x0009c080), 0x70);
96	>	DDrPatch_Byte  ((char*)(OniExe + 0x0009c084), 0x74);
97	>	DDrPatch_Byte  ((char*)(OniExe + 0x0009c110), 0x6c);
98		}
99
100		// Forced DirectInput (for Windows NT)
101		if (patch_directinput)
102	<	DDrPatch_Byte  (OniExe + 0x00002e6d, 0xeb);
103	<
102	>	DDrPatch_Byte((char*)(OniExe + 0x00002e6d), 0xeb);
103	>
104		if (patch_wpfadetime)
105		{
106		// Makes wp_fadetime actually have a function
107	<	const char fadetime_patch[] = { 0x66, 0x8B, 0x1D, 0xC4, 0x7D, 0x62, 0x00, 0x66, 0x89, 0x5E, 0x46, 0x5B, 0x5E, 0x83, 0xC4, 0x14, 0xC3 };
108	<	DDrPatch_Const (OniExe + 0x0011a889, fadetime_patch);
109	<	DDrPatch_Byte  (OniExe + 0x0011a560, 0x31);
107	>	const unsigned char fadetime_patch[] = { 0x66, 0x8B, 0x1D, 0xC4, 0x7D, 0x62, 0x00, 0x66, 0x89, 0x5E, 0x46, 0x5B, 0x5E, 0x83, 0xC4, 0x14, 0xC3 };
108	>	DDrPatch_Const ((char*)(OniExe + 0x0011a889), fadetime_patch);
109	>	DDrPatch_Byte  ((char*)(OniExe + 0x0011a560), 0x31);
110
111		// Sets the fadetime to 4800 by default
112	<	DDrPatch_Int16 (OniExe + 0x0011ab0e, 0x12c0);
112	>	DDrPatch_Int16 ((short*)(OniExe + 0x0011ab0e), 0x12c0);
113		}
114
115	+	// FIXME: add switches
116	+	//pathfinding fix
117	+
118	+
119	+
120
121		// Hackish fix for Konoko not kicking guns
122	+	// Don't use this, it breaks stairs.
123		if (patch_kickguns)
124		{
125	<	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 };
126	<	DDrPatch_Const (OniExe + 0x000dc420, kickgun_patch);
125	>	const unsigned 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 };
126	>	DDrPatch_Const ((char*)(OniExe + 0x000dc420), kickgun_patch);
127		}
128
129		// Cooldown timer exploit fix ^_^
130		if (patch_cooldowntimer)
131		{
132	<	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 };
133	<	DDrPatch_Const (OniExe + 0x0011a825, cooldown_patch);
132	>	const unsigned 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 };
133	>	DDrPatch_Const ((char*)(OniExe + 0x0011a825), cooldown_patch);
134		}
135
136		if (patch_throwtest)
137		{
138	<	const char throwtest_patch[] = { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 };
139	<	DDrPatch_Const(OniExe + 0x000dc190, throwtest_patch);
138	>	const unsigned char throwtest_patch[] = { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 };
139	>	DDrPatch_Const((char*)(OniExe + 0x000dc190), throwtest_patch);
140		}
141
142		// Disable UUrPlatform_Initalize/Terminate, this enables the Alt-Tab and the Windows key but has the possible side effect of allowing the screensaver to enable itself in-game.
143		if (patch_alttab)
144		{
145	<	DDrPatch_Byte  ((void*)UUrPlatform_Initialize, 0xC3);
146	<	DDrPatch_Byte  ((void*)UUrPlatform_Terminate, 0xC3);
145	>	// 0xC3 = ret, so makes those functions just have a "ret" instruction at their start
146	>	DDrPatch_Byte  ((char*)UUrPlatform_Initialize, 0xC3);
147	>	DDrPatch_Byte  ((char*)UUrPlatform_Terminate, 0xC3);
148		}
149
150		// Unlocks particle action disabling/enabling bits for all events. (Will be controlled by a command line switch when I figure out how to do that without Win32 hacks.)
151		if (patch_particledisablebit)
152	<	DDrPatch_Int16 (OniExe + 0x001b184, 0x9090);
152	>	DDrPatch_Int16 ((short*)(OniExe + 0x001b184), 0x9090);
153
154		// Multi-byte patch (multiple language support)
155		if (!patch_multibyte)
156		{
157	<	DDrPatch_Byte  (OniExe + 0x0002d8f8, 0xeb);
158	<	DDrPatch_Byte  (OniExe + 0x0002d9ad, 0xeb);
159	<	DDrPatch_Byte  (OniExe + 0x0002dbe2, 0xeb);
160	<	DDrPatch_Byte  (OniExe + 0x0002dec3, 0xeb);
161	<	DDrPatch_Byte  (OniExe + 0x0002e2ab, 0xeb);
162	<	DDrPatch_Byte  (OniExe + 0x0002e2c4, 0xeb);
163	<	DDrPatch_Byte  (OniExe + 0x0002e379, 0xeb);
164	<	DDrPatch_Byte  (OniExe + 0x0002e48c, 0xeb);
165	<	DDrPatch_Byte  (OniExe + 0x0002e4d0, 0xeb);
166	<	DDrPatch_Byte  (OniExe + 0x0002e4f4, 0xeb);
167	<	DDrPatch_Byte  (OniExe + 0x0002e646, 0xeb);
168	<	DDrPatch_Byte  (OniExe + 0x0002e695, 0xeb);
169	<	DDrPatch_Byte  (OniExe + 0x0002e944, 0xeb);
170	<	DDrPatch_Byte  (OniExe + 0x0002e95d, 0xeb);
171	<	DDrPatch_Byte  (OniExe + 0x0002e98e, 0xeb);
172	<	DDrPatch_Byte  (OniExe + 0x0002e9dc, 0xeb);
157	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002d8f8), 0xeb);
158	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002d9ad), 0xeb);
159	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002dbe2), 0xeb);
160	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002dec3), 0xeb);
161	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002e2ab), 0xeb);
162	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002e2c4), 0xeb);
163	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002e379), 0xeb);
164	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002e48c), 0xeb);
165	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002e4d0), 0xeb);
166	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002e4f4), 0xeb);
167	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002e646), 0xeb);
168	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002e695), 0xeb);
169	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002e944), 0xeb);
170	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002e95d), 0xeb);
171	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002e98e), 0xeb);
172	>	DDrPatch_Byte  ((char*)(OniExe + 0x0002e9dc), 0xeb);
173		}
174
175		// Cheat table patch
176		if (patch_cheattable)
177		{
178	<	DDrPatch_Int32 (OniExe + 0x000f616b, (int)&DDr_CheatTable[0].name);
179	<	DDrPatch_Int32 (OniExe + 0x000f617a, (int)&DDr_CheatTable[0].message_on);
178	>	DDrPatch_Int32 ((int*)(OniExe + 0x000f616b), (int)&DDr_CheatTable[0].name);
179	>	DDrPatch_Int32 ((int*)(OniExe + 0x000f617a), (int)&DDr_CheatTable[0].message_on);
180		}
181
182		// ARGB8888 textures
183		if (patch_argb8888)
184		{
185	<	DDrPatch_Byte  (OniExe + 0x00135af0, 0x07);
186	<	DDrPatch_Byte  (OniExe + 0x00135af4, 0x0B);
185	>	DDrPatch_Byte  ((char*)(OniExe + 0x00135af0), 0x07);
186	>	DDrPatch_Byte  ((char*)(OniExe + 0x00135af4), 0x0B);
187		}
188
189		//Test newweap patch
190	<	//      if (patch_newweapon) {
191	<	//              DDrPatch_NOOP( OniExe + 0x000E4DF8, 2);
192	<	//      }
190	>	if (patch_newweapon) {
191	>
192	>	//Makes it always say "Recieved weapon_name."
193	>	//Needs check for loc_4DFC66
194	>	//DDrPatch_NOOP((char*)(OniExe + 0x000E4DF8),2);
195	>
196	>	//Adds Weapon name and ammo meter to pickup autoprompt
197	>	DDrPatch_NOOP((char*)(OniExe + 0x000FAC73), 9);
198	>	DDrPatch_NOOP((char*)(OniExe + 0x000FAC80), 5);
199	>	DDrPatch_MakeCall((void*)(OniExe + 0xFAC85), (void*)DDrWeapon2Message);
200	>
201	>	//Moves location of colors
202	>	//DDrPatch_Int32((int*)(OniExe + 0x0002E3D5), (int)&DDrDSayColors );
203	>	//DDrPatch_Int32((int*)(OniExe + 0x0002E3DA), (int)&DDrDSayColors );
204	>	}
205
206		// Disable loading the vtuneapi.dll
207	<	if (patch_killvtune)
208	<	DDrPatch_Byte  (OniExe + 0x00026340, 0xC3);
207	>	//if (patch_killvtune)
208	>	//DDrPatch_Byte  ((char*)(OniExe + 0x00026340), 0xC3);
209
210		// Disable Oni's internal CLrGetCommandLine function (to eventually replace it with our own)
211		if (patch_getcmdline)
212	<	DDrPatch_NOOP  (OniExe + 0x000d3280, 51);
212	>	DDrPatch_NOOP  ((char*)(OniExe + 0x000d3280), 51);
213
214		// Disable Oni's command line parser so it doesn't interfere with ours
215		if (patch_disablecmdline)
216	<	DDrPatch_Int32 (OniExe + 0x000d3570, 0xc3c03366);
216	>	DDrPatch_Int32 ((int*)(OniExe + 0x000d3570), 0xc3c03366);
217	>
218	>	if (patch_bsl)
219	>	{
220	>	//Calculating the value of the needed offset is much more reliable when the compiler does it for you.
221	>
222	>	//TODO: fix moonshadow.
223	>	Character * Chr = 0;
224	>	int NoPath = (int)&(Chr[0].RegenHax) & 0x000000FF;
225	>	const unsigned char regen_patch[] =
226	>	{0x90, 0x90, 0x90, 0x90, 0x90,                          // mov    al, _WPgRegenerationCheat     -> NOOP
227	>	0x90, 0x90,                                                                     // test   al, al                                        -> NOOP
228	>	0x90, 0x90,                                                                     // jz     short loc_51BB98                      -> NOOP
229	>	0x8B, 0x86, (char)NoPath, 0x01, 0x00, 0x00, // mov     eax, [esi+Character.field_1E8]
230	>	//      -> mov     eax, [esi+Character.RegenHax]
231	>	0x85, 0xC0,                                                                     // test eax, eax
232	>	0x74, 0x21                                                                      // jnz 0x21 -> jz 0x21
233	>	};
234	>	DDrPatch_Const((char*)(OniExe + 0x0011BB64), regen_patch);
235	>	}
236	>
237	>	if(patch_chinese)
238	>	{
239	>	HMODULE dll = LoadLibrary("xfhsm_oni.dll");
240	>	if( dll )
241	>	{
242	>	void* proc = GetProcAddress( dll, "InstallHook" );
243	>	if(proc)
244	>	{
245	>	((CHINESEPROC)proc)(GetCurrentThreadId());
246	>	}
247	>	}
248	>	}
249	>
250	>	//Fix crappy ai2_shownames
251	>	if(1)
252	>	{
253	>	//Set distance above head to 4.0
254	>	DDrPatch_Int32((int*)(OniExe + 0x0008C998), 0x005296C8);
255	>	//texture height
256	>	DDrPatch_Byte((char*)(OniExe + 0x0008C9DF), 0x3F );
257	>	//texture       width
258	>	DDrPatch_NOOP((char*)(OniExe + 0x0008C9CA), 6 );
259	>	//Set the text color to whatever we like ;)
260	>	DDrPatch_NOOP((char*)(OniExe + 0x0008C898), 6 );
261	>	DDrPatch_Byte((char*)(OniExe + 0x0008C898), 0x8B );
262	>	DDrPatch_Byte((char*)(OniExe + 0x0008C899), 0xCE );
263	>	//FLATLINE?             DDrPatch_MakeCall((void*)(OniExe + 0x0008C8A3), FLrHook_DebugNameShadeHack);
264	>
265	>	//Make the background black for additive blending
266	>	//FLATLINE?             DDrPatch_MakeCall((void*)(OniExe + 0x0008C802), FLrHook_DebugNameTextureInit );
267	>	}
268	>
269	>	if(1)
270	>	{
271	>	//DDrPatch_NOOP((char*)(OniExe + 0x000E1957), 6 );
272	>	//DDrPatch_MakeCall((void*)(OniExe + 0x000E17F6), FLrHook_Lasers );
273	>	}
274	>
275	>	//Flatline related stuff
276	>	//      DDrPatch_MakeCall((void*)(OniExe + 0x000FBCEA), DDrText_Hook);
277
278	+	//FLATLINE?     DDrPatch_Int32((int*)(OniExe + 0x000B24D2), FLrSpawnHack);
279	+
280	+	//FLATLINE?     DDrPatch_NOOP((char*)(OniExe + 0x000C26CB), 6);
281	+
282	+	//FLATLINE?     DDrPatch_MakeCall((void*)(OniExe + 0x000C26CB), FLrHook_DoorOpen);
283	+	//FLATLINE?     DDrPatch_MakeCall((void*)(OniExe + 0x000EE3CF), FLrHook_ConsoleActivate);
284		return true;
285		}
286
#	Line 202 | Line 290 | bool DDrIniCallback(char* section, bool
290		{
291		if (newsection)
292		{
293	<	if (!stricmp(section, "options"))
293	>	if (!_stricmp(section, "options"))
294		ini_section = s_options;
295	<	else if (!stricmp(section, "patch"))
295	>	else if (!_stricmp(section, "patch"))
296		ini_section = s_patch;
297	<	else if (!stricmp(section, "bsl"))
297	>	else if (!_stricmp(section, "bsl"))
298		ini_section = s_bsl;
299	<	else if (!stricmp(section, "language"))
299	>	else if (!_stricmp(section, "language"))
300		ini_section = s_language;
301		else
302		{
#	Line 220 | Line 308 | bool DDrIniCallback(char* section, bool
308		switch (ini_section)
309		{
310		case s_options:
311	<	if (!stricmp(name, "usedaodanbsl"))
312	<	opt_usedaodanbsl = !stricmp(inifile_cleanstr(value), "true");
313	<	else if (!stricmp(name, "border"))
314	<	opt_border = !stricmp(inifile_cleanstr(value), "true");
315	<	else if (!stricmp(name, "shadow"))
316	<	opt_shadow = !stricmp(inifile_cleanstr(value), "true");
317	<	else if (!stricmp(name, "topmost"))
318	<	opt_topmost = !stricmp(inifile_cleanstr(value), "true");
319	<	else if (!stricmp(name, "multibyte"))
320	<	patch_multibyte = !stricmp(inifile_cleanstr(value), "true");
321	<	else if (!stricmp(name, "debug"))
322	<	AKgDebug_DebugMaps = !stricmp(inifile_cleanstr(value), "true");
323	<	else if (!stricmp(name, "debugfiles"))
324	<	BFgDebugFileEnable = !stricmp(inifile_cleanstr(value), "true");
325	<	else if (!stricmp(name, "findsounds"))
326	<	SSgSearchOnDisk = !stricmp(inifile_cleanstr(value), "true");
327	<	else if (!stricmp(name, "ignore_private_data"))
328	<	opt_ignore_private_data = !stricmp(inifile_cleanstr(value), "true");
329	<	else if (!stricmp(name, "sound"))
330	<	opt_sound = !stricmp(inifile_cleanstr(value), "true");
331	<	else if (!stricmp(name, "switch"))
332	<	M3gResolutionSwitch = !stricmp(inifile_cleanstr(value), "true");
311	>	if (!_stricmp(name, "usedaodanbsl"))
312	>	opt_usedaodanbsl = !_stricmp(inifile_cleanstr(value), "true");
313	>	else if (!_stricmp(name, "border"))
314	>	opt_border = !_stricmp(inifile_cleanstr(value), "true");
315	>	else if (!_stricmp(name, "topmost"))
316	>	opt_topmost = !_stricmp(inifile_cleanstr(value), "true");
317	>	else if (!_stricmp(name, "multibyte"))
318	>	patch_multibyte = !_stricmp(inifile_cleanstr(value), "true");
319	>	else if (!_stricmp(name, "debug"))
320	>	AKgDebug_DebugMaps = !_stricmp(inifile_cleanstr(value), "true");
321	>	else if (!_stricmp(name, "debugfiles"))
322	>	BFgDebugFileEnable = !_stricmp(inifile_cleanstr(value), "true");
323	>	else if (!_stricmp(name, "findsounds"))
324	>	SSgSearchOnDisk = !_stricmp(inifile_cleanstr(value), "true");
325	>	else if (!_stricmp(name, "ignore_private_data"))
326	>	opt_ignore_private_data = !_stricmp(inifile_cleanstr(value), "true");
327	>	else if (!_stricmp(name, "sound"))
328	>	opt_sound = !_stricmp(inifile_cleanstr(value), "true");
329	>	else if (!_stricmp(name, "switch"))
330	>	M3gResolutionSwitch = !_stricmp(inifile_cleanstr(value), "true");
331	>	//else if (!_stricmp(name, "devmode"))
332	>	//turn_dev_mode_on = !_stricmp(inifile_cleanstr(value), "true");
333		else
334		DDrStartupMessage("unrecognised option \"%s\"", name);
335		break;
336		case s_patch:
337	<	if (!stricmp(name, "fonttexturecache"))
338	<	patch_fonttexturecache = !stricmp(inifile_cleanstr(value), "true");
339	<	else if (!stricmp(name, "largetextures"))
340	<	patch_largetextures = !stricmp(inifile_cleanstr(value), "true");
341	<	else if (!stricmp(name, "levelplugins"))
342	<	patch_levelplugins = !stricmp(inifile_cleanstr(value), "true");
343	<	else if (!stricmp(name, "pathfinding"))
344	<	patch_pathfinding = !stricmp(inifile_cleanstr(value), "true");
345	<	else if (!stricmp(name, "projaware"))
346	<	patch_projaware = !stricmp(inifile_cleanstr(value), "true");
347	<	else if (!stricmp(name, "directinput"))
348	<	patch_directinput = !stricmp(inifile_cleanstr(value), "true");
349	<	else if (!stricmp(name, "wpfadetime"))
350	<	patch_wpfadetime = !stricmp(inifile_cleanstr(value), "true");
351	<	else if (!stricmp(name, "kickguns"))
352	<	patch_kickguns = !stricmp(inifile_cleanstr(value), "true");
353	<	else if (!stricmp(name, "cooldowntimer"))
354	<	patch_cooldowntimer = !stricmp(inifile_cleanstr(value), "true");
355	<	else if (!stricmp(name, "throwtest"))
356	<	patch_throwtest = !stricmp(inifile_cleanstr(value), "true");
357	<	else if (!stricmp(name, "alttab"))
358	<	patch_alttab = !stricmp(inifile_cleanstr(value), "true");
359	<	else if (!stricmp(name, "particledisablebit"))
360	<	patch_particledisablebit = !stricmp(inifile_cleanstr(value), "true");
361	<	else if (!stricmp(name, "multibyte"))
362	<	patch_multibyte = !stricmp(inifile_cleanstr(value), "true");
363	<	else if (!stricmp(name, "cheattable"))
364	<	patch_cheattable = !stricmp(inifile_cleanstr(value), "true");
365	<	else if (!stricmp(name, "argb8888"))
366	<	patch_argb8888 = !stricmp(inifile_cleanstr(value), "true");
367	<	else if (!stricmp(name, "killvtune"))
368	<	patch_killvtune = !stricmp(inifile_cleanstr(value), "true");
369	<	else if (!stricmp(name, "getcmdline"))
370	<	patch_getcmdline = !stricmp(inifile_cleanstr(value), "true");
371	<	else if (!stricmp(name, "disablecmdline"))
372	<	patch_disablecmdline = !stricmp(inifile_cleanstr(value), "true");
373	<	else if (!stricmp(name, "safeprintf"))
374	<	patch_safeprintf = !stricmp(inifile_cleanstr(value), "true");
375	<	else if (!stricmp(name, "daodandisplayenum"))
376	<	patch_daodandisplayenum = !stricmp(inifile_cleanstr(value), "true");
377	<	else if (!stricmp(name, "usegettickcount"))
378	<	patch_usegettickcount = !stricmp(inifile_cleanstr(value), "true");
379	<	else if (!stricmp(name, "cheatsenabled"))
380	<	patch_cheatsenabled = !stricmp(inifile_cleanstr(value), "true");
381	<	else if (!stricmp(name, "usedaodangl"))
382	<	patch_usedaodangl = !stricmp(inifile_cleanstr(value), "true");
383	<	else if (!stricmp(name, "windowhack"))
384	<	patch_windowhack = !stricmp(inifile_cleanstr(value), "true");
385	<	else if (!stricmp(name, "daodaninit"))
386	<	patch_daodaninit = !stricmp(inifile_cleanstr(value), "true");
387	<	else if (!stricmp(name, "bsl"))
388	<	patch_bsl = !stricmp(inifile_cleanstr(value), "true");
389	<	else if (!stricmp(name, "cheater"))
390	<	patch_cheater = !stricmp(inifile_cleanstr(value), "true");
337	>	if (!_stricmp(name, "fonttexturecache"))
338	>	patch_fonttexturecache = !_stricmp(inifile_cleanstr(value), "true");
339	>	else if (!_stricmp(name, "largetextures"))
340	>	patch_largetextures = !_stricmp(inifile_cleanstr(value), "true");
341	>	else if (!_stricmp(name, "levelplugins"))
342	>	patch_levelplugins = !_stricmp(inifile_cleanstr(value), "true");
343	>	else if (!_stricmp(name, "pathfinding"))
344	>	patch_pathfinding = !_stricmp(inifile_cleanstr(value), "true");
345	>	else if (!_stricmp(name, "projaware"))
346	>	patch_projaware = !_stricmp(inifile_cleanstr(value), "true");
347	>	else if (!_stricmp(name, "directinput"))
348	>	patch_directinput = !_stricmp(inifile_cleanstr(value), "true");
349	>	else if (!_stricmp(name, "wpfadetime"))
350	>	patch_wpfadetime = !_stricmp(inifile_cleanstr(value), "true");
351	>	else if (!_stricmp(name, "kickguns"))
352	>	patch_kickguns = !_stricmp(inifile_cleanstr(value), "true");
353	>	else if (!_stricmp(name, "cooldowntimer"))
354	>	patch_cooldowntimer = !_stricmp(inifile_cleanstr(value), "true");
355	>	else if (!_stricmp(name, "throwtest"))
356	>	patch_throwtest = !_stricmp(inifile_cleanstr(value), "true");
357	>	else if (!_stricmp(name, "alttab"))
358	>	patch_alttab = !_stricmp(inifile_cleanstr(value), "true");
359	>	else if (!_stricmp(name, "particledisablebit"))
360	>	patch_particledisablebit = !_stricmp(inifile_cleanstr(value), "true");
361	>	else if (!_stricmp(name, "multibyte"))
362	>	patch_multibyte = !_stricmp(inifile_cleanstr(value), "true");
363	>	else if (!_stricmp(name, "cheattable"))
364	>	patch_cheattable = !_stricmp(inifile_cleanstr(value), "true");
365	>	else if (!_stricmp(name, "argb8888"))
366	>	patch_argb8888 = !_stricmp(inifile_cleanstr(value), "true");
367	>	else if (!_stricmp(name, "killvtune"))
368	>	patch_killvtune = !_stricmp(inifile_cleanstr(value), "true");
369	>	else if (!_stricmp(name, "getcmdline"))
370	>	patch_getcmdline = !_stricmp(inifile_cleanstr(value), "true");
371	>	else if (!_stricmp(name, "disablecmdline"))
372	>	patch_disablecmdline = !_stricmp(inifile_cleanstr(value), "true");
373	>	else if (!_stricmp(name, "safeprintf"))
374	>	patch_safeprintf = !_stricmp(inifile_cleanstr(value), "true");
375	>	else if (!_stricmp(name, "daodandisplayenum"))
376	>	patch_daodandisplayenum = !_stricmp(inifile_cleanstr(value), "true");
377	>	else if (!_stricmp(name, "usegettickcount"))
378	>	patch_usegettickcount = !_stricmp(inifile_cleanstr(value), "true");
379	>	else if (!_stricmp(name, "cheatsenabled"))
380	>	patch_cheatsenabled = !_stricmp(inifile_cleanstr(value), "true");
381	>	else if (!_stricmp(name, "usedaodangl"))
382	>	patch_usedaodangl = !_stricmp(inifile_cleanstr(value), "true");
383	>	else if (!_stricmp(name, "windowhack"))
384	>	patch_windowhack = !_stricmp(inifile_cleanstr(value), "true");
385	>	else if (!_stricmp(name, "daodaninit"))
386	>	patch_daodaninit = !_stricmp(inifile_cleanstr(value), "true");
387	>	else if (!_stricmp(name, "bsl"))
388	>	patch_bsl = !_stricmp(inifile_cleanstr(value), "true");
389	>	else if (!_stricmp(name, "cheater"))
390	>	patch_cheater = !_stricmp(inifile_cleanstr(value), "true");
391	>	else if (!_stricmp(name, "newweap"))
392	>	patch_newweapon = !_stricmp(inifile_cleanstr(value), "true");
393		else
394		DDrStartupMessage("unrecognised patch \"%s\"", name);
395		break;
396		case s_language:
397	<	if (!stricmp(name, "savepoint"))
397	>	if (!_stricmp(name, "chinese"))
398	>	patch_chinese = true;
399	>	else if (!_stricmp(name, "savepoint"))
400		{
401	<	char* str = strdup(value);
402	<	DDrPatch_Int32(OniExe + 0x000fd730, (int)str);
403	<	DDrPatch_Int32(OniExe + 0x000fd738, (int)str);
401	>	char* str = _strdup(value);
402	>	DDrPatch_Int32((int*)(OniExe + 0x000fd730), (int)str);
403	>	DDrPatch_Int32((int*)(OniExe + 0x000fd738), (int)str);
404		}
405	<	else if (!stricmp(name, "syndicatewarehouse"))
405	>	else if (!_stricmp(name, "syndicatewarehouse"))
406		{
407	<	char* str = strdup(value);
408	<	DDrPatch_Int32(OniExe + 0x000fd71a, (int)str);
409	<	DDrPatch_Int32(OniExe + 0x0010ef75, (int)str);
407	>	char* str = _strdup(value);
408	>	DDrPatch_Int32((int*)(OniExe + 0x000fd71a), (int)str);
409	>	DDrPatch_Int32((int*)(OniExe + 0x0010ef75), (int)str);
410		}
411	<	else if (!stricmp(name, "damn"))
412	<	DDrPatch_StrDup(OniExe + 0x0010fb6e, value);
413	<	else if (!stricmp(name, "blam"))
414	<	DDrPatch_StrDup(OniExe + 0x0010fb73, value);
415	<	else if (!stricmp(name, "shapeshifter_on"))
416	<	DDr_CheatTable[0].message_on = strdup(value);
417	<	else if (!stricmp(name, "shapeshifter_off"))
418	<	DDr_CheatTable[0].message_off = strdup(value);
419	<	else if (!stricmp(name, "liveforever_on"))
420	<	DDr_CheatTable[1].message_on = strdup(value);
421	<	else if (!stricmp(name, "liveforever_off"))
422	<	DDr_CheatTable[1].message_off = strdup(value);
423	<	else if (!stricmp(name, "touchofdeath_on"))
424	<	DDr_CheatTable[2].message_on = strdup(value);
425	<	else if (!stricmp(name, "touchofdeath_off"))
426	<	DDr_CheatTable[2].message_off = strdup(value);
427	<	else if (!stricmp(name, "canttouchthis_on"))
428	<	DDr_CheatTable[3].message_on = strdup(value);
429	<	else if (!stricmp(name, "canttouchthis_off"))
430	<	DDr_CheatTable[3].message_off = strdup(value);
431	<	else if (!stricmp(name, "fatloot_on"))
432	<	DDr_CheatTable[4].message_on = strdup(value);
433	<	else if (!stricmp(name, "glassworld_on"))
434	<	DDr_CheatTable[5].message_on = strdup(value);
435	<	else if (!stricmp(name, "glassworld_off"))
436	<	DDr_CheatTable[5].message_off = strdup(value);
437	<	else if (!stricmp(name, "winlevel_on"))
438	<	DDr_CheatTable[6].message_on = strdup(value);
439	<	else if (!stricmp(name, "loselevel_on"))
440	<	DDr_CheatTable[7].message_on = strdup(value);
441	<	else if (!stricmp(name, "bighead_on"))
442	<	DDr_CheatTable[8].message_on = strdup(value);
443	<	else if (!stricmp(name, "bighead_off"))
444	<	DDr_CheatTable[8].message_off = strdup(value);
445	<	else if (!stricmp(name, "minime_on"))
446	<	DDr_CheatTable[9].message_on = strdup(value);
447	<	else if (!stricmp(name, "minime_off"))
448	<	DDr_CheatTable[9].message_off = strdup(value);
449	<	else if (!stricmp(name, "superammo_on"))
450	<	DDr_CheatTable[10].message_on = strdup(value);
451	<	else if (!stricmp(name, "superammo_off"))
452	<	DDr_CheatTable[10].message_off = strdup(value);
453	<	else if (!stricmp(name, "devmode_on"))
411	>	else if (!_stricmp(name, "damn"))
412	>	DDrPatch__strdup((int*)(OniExe + 0x0010fb6e), value);
413	>	else if (!_stricmp(name, "blam"))
414	>	DDrPatch__strdup((int*)(OniExe + 0x0010fb73), value);
415	>	else if (!_stricmp(name, "shapeshifter_on"))
416	>	DDr_CheatTable[0].message_on = _strdup(value);
417	>	else if (!_stricmp(name, "shapeshifter_off"))
418	>	DDr_CheatTable[0].message_off = _strdup(value);
419	>	else if (!_stricmp(name, "liveforever_on"))
420	>	DDr_CheatTable[1].message_on = _strdup(value);
421	>	else if (!_stricmp(name, "liveforever_off"))
422	>	DDr_CheatTable[1].message_off = _strdup(value);
423	>	else if (!_stricmp(name, "touchofdeath_on"))
424	>	DDr_CheatTable[2].message_on = _strdup(value);
425	>	else if (!_stricmp(name, "touchofdeath_off"))
426	>	DDr_CheatTable[2].message_off = _strdup(value);
427	>	else if (!_stricmp(name, "canttouchthis_on"))
428	>	DDr_CheatTable[3].message_on = _strdup(value);
429	>	else if (!_stricmp(name, "canttouchthis_off"))
430	>	DDr_CheatTable[3].message_off = _strdup(value);
431	>	else if (!_stricmp(name, "fatloot_on"))
432	>	DDr_CheatTable[4].message_on = _strdup(value);
433	>	else if (!_stricmp(name, "glassworld_on"))
434	>	DDr_CheatTable[5].message_on = _strdup(value);
435	>	else if (!_stricmp(name, "glassworld_off"))
436	>	DDr_CheatTable[5].message_off = _strdup(value);
437	>	else if (!_stricmp(name, "winlevel_on"))
438	>	DDr_CheatTable[6].message_on = _strdup(value);
439	>	else if (!_stricmp(name, "loselevel_on"))
440	>	DDr_CheatTable[7].message_on = _strdup(value);
441	>	else if (!_stricmp(name, "bighead_on"))
442	>	DDr_CheatTable[8].message_on = _strdup(value);
443	>	else if (!_stricmp(name, "bighead_off"))
444	>	DDr_CheatTable[8].message_off = _strdup(value);
445	>	else if (!_stricmp(name, "minime_on"))
446	>	DDr_CheatTable[9].message_on = _strdup(value);
447	>	else if (!_stricmp(name, "minime_off"))
448	>	DDr_CheatTable[9].message_off = _strdup(value);
449	>	else if (!_stricmp(name, "superammo_on"))
450	>	DDr_CheatTable[10].message_on = _strdup(value);
451	>	else if (!_stricmp(name, "superammo_off"))
452	>	DDr_CheatTable[10].message_off = _strdup(value);
453	>	else if (!_stricmp(name, "devmode_on"))
454		{
455	<	char* str = strdup(value);
455	>	char* str = _strdup(value);
456		DDr_CheatTable[11].message_on = str;
457		DDr_CheatTable[cheat_x].message_on = str;
458		}
459	<	else if (!stricmp(name, "devmode_off"))
459	>	else if (!_stricmp(name, "devmode_off"))
460		{
461	<	char* str = strdup(value);
461	>	char* str = _strdup(value);
462		DDr_CheatTable[11].message_off = str;
463		DDr_CheatTable[cheat_x].message_off = str;
464		}
465	<	else if (!stricmp(name, "reservoirdogs_on"))
466	<	DDr_CheatTable[12].message_on = strdup(value);
467	<	else if (!stricmp(name, "reservoirdogs_off"))
468	<	DDr_CheatTable[12].message_off = strdup(value);
469	<	else if (!stricmp(name, "roughjustice_on"))
470	<	DDr_CheatTable[13].message_on = strdup(value);
471	<	else if (!stricmp(name, "roughjustice_off"))
472	<	DDr_CheatTable[13].message_off = strdup(value);
473	<	else if (!stricmp(name, "chenille_on"))
474	<	DDr_CheatTable[14].message_on = strdup(value);
475	<	else if (!stricmp(name, "chenille_off"))
476	<	DDr_CheatTable[14].message_off = strdup(value);
477	<	else if (!stricmp(name, "behemoth_on"))
478	<	DDr_CheatTable[15].message_on = strdup(value);
479	<	else if (!stricmp(name, "behemoth_off"))
480	<	DDr_CheatTable[15].message_off = strdup(value);
481	<	else if (!stricmp(name, "elderrune_on"))
482	<	DDr_CheatTable[16].message_on = strdup(value);
483	<	else if (!stricmp(name, "elderrune_off"))
484	<	DDr_CheatTable[16].message_off = strdup(value);
485	<	else if (!stricmp(name, "moonshadow_on"))
486	<	DDr_CheatTable[17].message_on = strdup(value);
487	<	else if (!stricmp(name, "moonshadow_off"))
488	<	DDr_CheatTable[17].message_off = strdup(value);
489	<	else if (!stricmp(name, "munitionfrenzy_on"))
490	<	DDr_CheatTable[18].message_on = strdup(value);
491	<	else if (!stricmp(name, "fistsoflegend_on"))
492	<	DDr_CheatTable[19].message_on = strdup(value);
493	<	else if (!stricmp(name, "fistsoflegend_off"))
494	<	DDr_CheatTable[19].message_off = strdup(value);
495	<	else if (!stricmp(name, "killmequick_on"))
496	<	DDr_CheatTable[20].message_on = strdup(value);
497	<	else if (!stricmp(name, "killmequick_off"))
498	<	DDr_CheatTable[20].message_off = strdup(value);
499	<	else if (!stricmp(name, "carousel_on"))
500	<	DDr_CheatTable[21].message_on = strdup(value);
501	<	else if (!stricmp(name, "carousel_off"))
502	<	DDr_CheatTable[21].message_off = strdup(value);
465	>	else if (!_stricmp(name, "reservoirdogs_on"))
466	>	DDr_CheatTable[12].message_on = _strdup(value);
467	>	else if (!_stricmp(name, "reservoirdogs_off"))
468	>	DDr_CheatTable[12].message_off = _strdup(value);
469	>	else if (!_stricmp(name, "roughjustice_on"))
470	>	DDr_CheatTable[13].message_on = _strdup(value);
471	>	else if (!_stricmp(name, "roughjustice_off"))
472	>	DDr_CheatTable[13].message_off = _strdup(value);
473	>	else if (!_stricmp(name, "chenille_on"))
474	>	DDr_CheatTable[14].message_on = _strdup(value);
475	>	else if (!_stricmp(name, "chenille_off"))
476	>	DDr_CheatTable[14].message_off = _strdup(value);
477	>	else if (!_stricmp(name, "behemoth_on"))
478	>	DDr_CheatTable[15].message_on = _strdup(value);
479	>	else if (!_stricmp(name, "behemoth_off"))
480	>	DDr_CheatTable[15].message_off = _strdup(value);
481	>	else if (!_stricmp(name, "elderrune_on"))
482	>	DDr_CheatTable[16].message_on = _strdup(value);
483	>	else if (!_stricmp(name, "elderrune_off"))
484	>	DDr_CheatTable[16].message_off = _strdup(value);
485	>	else if (!_stricmp(name, "moonshadow_on"))
486	>	DDr_CheatTable[17].message_on = _strdup(value);
487	>	else if (!_stricmp(name, "moonshadow_off"))
488	>	DDr_CheatTable[17].message_off = _strdup(value);
489	>	else if (!_stricmp(name, "munitionfrenzy_on"))
490	>	DDr_CheatTable[18].message_on = _strdup(value);
491	>	else if (!_stricmp(name, "fistsoflegend_on"))
492	>	DDr_CheatTable[19].message_on = _strdup(value);
493	>	else if (!_stricmp(name, "fistsoflegend_off"))
494	>	DDr_CheatTable[19].message_off = _strdup(value);
495	>	else if (!_stricmp(name, "killmequick_on"))
496	>	DDr_CheatTable[20].message_on = _strdup(value);
497	>	else if (!_stricmp(name, "killmequick_off"))
498	>	DDr_CheatTable[20].message_off = _strdup(value);
499	>	else if (!_stricmp(name, "carousel_on"))
500	>	DDr_CheatTable[21].message_on = _strdup(value);
501	>	else if (!_stricmp(name, "carousel_off"))
502	>	DDr_CheatTable[21].message_off = _strdup(value);
503		else
504		DDrStartupMessage("unrecognised language item \"%s\"", name);
505		break;
#	Line 421 | Line 513 | bool DDrIniCallback(char* section, bool
513
514		void DDrConfig()
515		{
516	+
517		if (GetFileAttributes("daodan.ini") == INVALID_FILE_ATTRIBUTES)
518		{
519	+	FILE* fp;
520		DDrStartupMessage("daodan.ini doesn't exist, creating");
521	<	FILE* fp = fopen("daodan.ini", "w");
521	>	fp = fopen("daodan.ini", "w");
522		if (fp)
523		{
524		fputs("[Options]\n", fp);
#	Line 444 | Line 538 | void ONICALL DDrGame_Init()
538		SLrDaodan_Initalize();
539		}
540
541	+	void DDrException() {
542	+	int* i = 0;
543	+	*i = 1;
544	+	}
545	+	#include <stdio.h>
546	+
547	+	//this was broken
548	+	FILE** _UUgError_WarningFile = (FILE**)0x005711B4;
549	+	FILE *__fastcall DDrPrintWarning(int filename, int linenumber, unsigned __int16 errornum, int message)
550	+	{
551	+
552	+	FILE *v4; // eax@1
553	+	FILE *result; // eax@4
554	+	char v6[512]; // [sp+0h] [bp-100h]@1
555	+	FILE* UUgError_WarningFile = *_UUgError_WarningFile;
556	+
557	+	if (filename && message && (strlen((const char*)filename)+strlen((const char*)message))<420) {
558	+	sprintf(
559	+	v6,
560	+	"Error %x reported from File: %s, Line: %d (message follows) \r\n%s",
561	+	errornum,
562	+	(const char*)filename,
563	+	linenumber,
564	+	(const char*)message);
565	+
566	+	if ( UUgError_WarningFile
567	+	|| (UUgError_WarningFile = oni_fopen("debugger.txt", "wb"), UUgError_WarningFile ) )
568	+	{
569	+	oni_fprintf(UUgError_WarningFile, "%s\r\n", v6);
570	+	oni_fflush(UUgError_WarningFile);
571	+	}
572	+	}
573	+	//oni_fprintf(stdout, v6);
574	+	//sprintf(&v6, "%s", message);
575	+	*_UUgError_WarningFile = UUgError_WarningFile;
576	+	result = UUgError_WarningFile;
577	+	return result;
578	+	}
579	+
580		void __cdecl DDrMain(int argc, char* argv[])
581		{
582	+	int i;
583	+	char* section;
584	+	char* option;
585	+	bool falseoption;
586	+
587		DDrStartupMessage("daodan attached!");
588
589	+	// Tell Oni to not load non levelX_final-files by default:
590		opt_ignore_private_data = false;
591	+
592	+	// Enable sound by default:
593		opt_sound = true;
594
595		DDrConfig();
596		DDrStartupMessage("parsing command line...");
456	–	int i;
457	–	char* section;
458	–	char* option;
459	–	bool falseoption;
597		for (i = 1; i < argc; i ++)
598		{
599		if (argv[i][0] == '-')
#	Line 493 | Line 630 | void __cdecl DDrMain(int argc, char* arg
630
631		// Safe startup message printer
632		if (patch_safeprintf)
633	<	DDrPatch_MakeJump(UUrStartupMessage, DDrStartupMessage);
633	>	DDrPatch_MakeJump((void*)UUrStartupMessage, (void*)DDrStartupMessage);
634
635		// Daodan device mode enumeration function
636		if (patch_daodandisplayenum)
637	<	DDrPatch_MakeJump(gl_enumerate_valid_display_modes, daodan_enumerate_valid_display_modes);
637	>	DDrPatch_MakeJump((void*)gl_enumerate_valid_display_modes, (void*)daodan_enumerate_valid_display_modes);
638
639		// Performance patch
640		if (patch_usegettickcount)
641		{
642	<	DDrPatch_MakeJump(UUrMachineTime_High, DDrMachineTime_High);
643	<	DDrPatch_MakeJump(UUrMachineTime_High_Frequency, DDrMachineTime_High_Frequency);
644	<	DDrPatch_MakeJump(UUrMachineTime_Sixtieths, DDrMachineTime_Sixtieths);
642	>	DDrPatch_MakeJump((void*)UUrMachineTime_High, (void*)DDrMachineTime_High);
643	>	DDrPatch_MakeJump((void*)UUrMachineTime_High_Frequency, (void*)DDrMachineTime_High_Frequency);
644	>	DDrPatch_MakeJump((void*)UUrMachineTime_Sixtieths, (void*)DDrMachineTime_Sixtieths);
645		}
646	<
646	>
647		// Cheats always enabled
648		if (patch_cheatsenabled)
649	<	DDrPatch_MakeJump(ONrPersist_GetWonGame, DDrPersist_GetWonGame);
650	<
649	>	DDrPatch_MakeJump((void*)ONrPersist_GetWonGame, (void*)DDrPersist_GetWonGame);
650	>
651		// Windowed mode
652		if (patch_usedaodangl)
653		{
654	<	DDrPatch_MakeJump(ONrPlatform_Initialize, DDrPlatform_Initialize);
655	<	DDrPatch_MakeJump(gl_platform_initialize, daodangl_platform_initialize);
519	<	}
654	>	DDrPatch_NOOP((char*)(OniExe + 0x000032B7), 6);
655	>	DDrPatch_MakeCall((void*)(OniExe + 0x000032B7), (void*)LIiP_SetCursorPosHook);
656
657	+	DDrPatch_NOOP((char*)(OniExe + 0x00003349), 6);
658	+	DDrPatch_MakeCall((void*)(OniExe + 0x00003349), (void*)LIiP_SetCursorPosHook);
659	+	DDrPatch_MakeJump((void*)ONrPlatform_Initialize, (void*)DDrPlatform_Initialize);
660	+	DDrPatch_MakeJump((void*)gl_platform_initialize, (void*)daodangl_platform_initialize);
661	+	}
662		// Hacked windowed mode (for when daodangl isn't working properly)
663	<	if (patch_windowhack)
663	>	else if (patch_windowhack)
664		DDrWindowHack_Install();
665
666		if (patch_daodaninit)
667	<	DDrPatch_MakeCall(OniExe + 0x000d345a, DDrGame_Init);
667	>	DDrPatch_MakeCall((void*)(OniExe + 0x000d345a), (void*)DDrGame_Init);
668
669		// Patches for existing BSL functions
670		if (patch_bsl)
671		SLrDaodan_Patch();
672	<
672	>
673		if (patch_cheater)
674		{
675	<	DDrPatch_MakeCall(OniExe + 0x000f618f, DDrCheater);
676	<	DDrPatch_Int16(OniExe + 0x000deb45, 0x5590);
677	<	DDrPatch_MakeCall(OniExe + 0x000deb47, FallingFrames);
678	<	DDrPatch_MakeJump(OniExe + 0x0010f021, DDrCheater_LevelLoad);
675	>	DDrPatch_MakeCall((void*)(OniExe + 0x000f618f), (void*)DDrCheater);
676	>	DDrPatch_Int16((short*)(OniExe + 0x000deb45), 0x5590);
677	>	#if 1
678	>	DDrPatch_MakeCall((void*)(OniExe + 0x000deb47), (void*)FallingFrames);
679	>	#endif
680	>	DDrPatch_MakeJump((void*)(OniExe + 0x0010f021), (void*)DDrCheater_LevelLoad);
681		}
682	+
683	+	//DDrPatch_MakeJump((void*)(OniExe + 0x000378c0, (void*)DDrException);
684	+	DDrPatch_MakeJump((void*)(OniExe + 0x000245A0), (void*)DDrPrintWarning);
685	+	//init_daodan_gl();
686
687	<	init_daodan_gl();
541	<
542	<	ONiMain(argc, argv);
687	>	ONiMain(argc, argv);
688		}
689		/*
690		void DDrWrongExe()
#	Line 572 | Line 717 | BOOL WINAPI DllMain(HINSTANCE hinstDLL,
717		DDrDLLModule = hinstDLL;
718		DDrONiModule = GetModuleHandle(NULL);
719
720	<	if (*(uint32_t*)((void*)OniExe + 0x0011acd0) == 0x09d36852)
721	<	DDrPatch_MakeCall(OniExe + 0x0010fb49, DDrMain);
720	>	if (*(uint32_t*)(OniExe + 0x0011acd0) == 0x09d36852)
721	>	DDrPatch_MakeCall((void*)(OniExe + 0x0010fb49), (void*)DDrMain);
722		else
723		ExitProcess(0);
724		break;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)