ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/Daodan/src/Daodan.c

Comparing Daodan/src/Daodan.c (file contents):
Revision 349 by rossy, Wed Jun 10 12:40:16 2009 UTC vs.
Revision 677 by alloc, Sat Mar 2 23:46:33 2013 UTC

#	Line 6 | Line 6
6		#include "Daodan_Win32.h"
7		#include "Daodan_Cheater.h"
8		#include "Daodan_Persistence.h"
9	<
9	>	#include "Daodan_BSL.h"
10	>	#include "Daodan_Console.h"
11		#include "Daodan_WindowHack.h"
12
13		#include "Oni.h"
#	Line 34 | Line 35 | bool patch_cooldowntimer = true;
35		bool patch_throwtest = false;
36		bool patch_alttab = true;
37		bool patch_particledisablebit = false;
38	<	bool patch_multibyte = true;
38	>	bool patch_multibyte = false;
39		bool patch_cheattable = true;
40	+	bool patch_argb8888 = true;
41	+	bool patch_killvtune = true;
42	+	bool patch_getcmdline = true;
43	+	bool patch_disablecmdline = true;
44
45		bool patch_safeprintf = true;
46		bool patch_daodandisplayenum = true;
#	Line 43 | Line 48 | bool patch_usegettickcount = true;
48		bool patch_cheatsenabled = true;
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	+	bool patch_newweapon = true;
55	+	bool opt_usedaodanbsl = true;
56	+	bool opt_border = true;
57	+	bool opt_shadow = false;
58	+	bool opt_topmost = false;
59
60	+	typedef int (__cdecl *CHINESEPROC)(DWORD WINAPI);
61	+	bool patch_chinese = false;
62		bool DDrPatch_Init()
63		{
64		DDrStartupMessage("patching engine");
#	Line 51 | Line 66 | bool DDrPatch_Init()
66		// Font texture cache doubled
67		if (patch_fonttexturecache)
68		{
69	<	DDrPatch_Byte  (OniExe + 0x00020ea7, 0x20);
70	<	DDrPatch_Byte  (OniExe + 0x00020f4a, 0x40);
69	>	DDrPatch_Byte(OniExe + 0x00020ea7, 0x20);
70	>	DDrPatch_Byte(OniExe + 0x00020f4a, 0x40);
71		}
72
73		// Now supports textures up to 512x512
#	Line 66 | Line 81 | bool DDrPatch_Init()
81		// Pathfinding grid cache size x8
82		if (patch_pathfinding)
83		{
84	+	const char pathfinding[2] = {0x90 , 0xE9 };
85		DDrPatch_Byte  (OniExe + 0x0010b03b, 0x20);
86		DDrPatch_Byte  (OniExe + 0x0010b04c, 0x20);
87	+
88	+	//other stuff
89	+	DDrPatch_Const(0x440789, pathfinding);
90		}
91
92		// Projectile awareness fixed
#	Line 82 | Line 101 | bool DDrPatch_Init()
101		// Forced DirectInput (for Windows NT)
102		if (patch_directinput)
103		DDrPatch_Byte  (OniExe + 0x00002e6d, 0xeb);
104	<
104	>
105		if (patch_wpfadetime)
106		{
107		// Makes wp_fadetime actually have a function
#	Line 91 | Line 110 | bool DDrPatch_Init()
110		DDrPatch_Byte  (OniExe + 0x0011a560, 0x31);
111
112		// Sets the fadetime to 4800 by default
113	<	DDrPatch_Int16 (OniExe + 0x0011ab0e, 0x12c0);
113	>	DDrPatch_Int16 ((OniExe + 0x0011ab0e), 0x12c0);
114		}
115
116	+	// FIXME: add switches
117	+	//pathfinding fix
118	+
119	+
120	+
121
122		// Hackish fix for Konoko not kicking guns
123	+	// Don't use this, it breaks stairs.
124		if (patch_kickguns)
125		{
126		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 };
#	Line 127 | Line 152 | bool DDrPatch_Init()
152		DDrPatch_Int16 (OniExe + 0x001b184, 0x9090);
153
154		// Multi-byte patch (multiple language support)
155	<	if (patch_multibyte)
155	>	if (!patch_multibyte)
156		{
157		DDrPatch_Byte  (OniExe + 0x0002d8f8, 0xeb);
158		DDrPatch_Byte  (OniExe + 0x0002d9ad, 0xeb);
#	Line 150 | Line 175 | bool DDrPatch_Init()
175		// Cheat table patch
176		if (patch_cheattable)
177		{
178	<	DDrPatch_Int32 (OniExe + 0x000f616b, (int)&DDr_CheatTable[0].name);
178	>	DDrPatch_Int32 (0x004f616b, (int)&DDr_CheatTable[0].name);
179		DDrPatch_Int32 (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);
187	+	}
188	+
189	+	//Test newweap patch
190	+	if (patch_newweapon) {
191	+
192	+	//Makes it always say "Recieved weapon_name."
193	+	//Needs check for loc_4DFC66
194	+	//DDrPatch_NOOP( OniExe + 0x000E4DF8,2);
195	+
196	+	//Adds Weapon name and ammo meter to pickup autoprompt
197	+	DDrPatch_NOOP( OniExe + 0x000FAC73, 9);
198	+	DDrPatch_NOOP( OniExe + 0x000FAC80, 5);
199	+	DDrPatch_MakeCall( OniExe + 0xFAC85, DDrWeapon2Message);
200	+
201	+	//Moves location of colors
202	+	//DDrPatch_Int32( 0x0042E3D5, (int)&DDrDSayColors );
203	+	//DDrPatch_Int32( 0x0042E3DA, (int)&DDrDSayColors );
204	+	}
205	+
206	+	// Disable loading the vtuneapi.dll
207	+	//if (patch_killvtune)
208	+	//DDrPatch_Byte  (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);
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);
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 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(0x0051BB64, 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(0x0048C998, 0x005296C8);
255	+	//texture height
256	+	DDrPatch_Byte( 0x0048C9DF, 0x3F );
257	+	//texture       width
258	+	DDrPatch_NOOP( (char*)0x0048C9CA, 6 );
259	+	//Set the text color to whatever we like ;)
260	+	DDrPatch_NOOP( 0x0048C898, 6 );
261	+	DDrPatch_Byte( 0x0048C898, 0x8B );
262	+	DDrPatch_Byte( 0x0048C899, 0xCE );
263	+	//FLATLINE?             DDrPatch_MakeCall( 0x0048C8A3, FLrHook_DebugNameShadeHack);
264	+
265	+	//Make the background black for additive blending
266	+	//FLATLINE?             DDrPatch_MakeCall( 0x0048C802, FLrHook_DebugNameTextureInit );
267	+	}
268	+
269	+	if(1)
270	+	{
271	+	//DDrPatch_NOOP( 0x004E1957, 6 );
272	+	//DDrPatch_MakeCall( 0x004E17F6, FLrHook_Lasers );
273	+	}
274	+
275	+	//Flatline related stuff
276	+	//      DDrPatch_MakeCall(0x004FBCEA, DDrText_Hook);
277	+
278	+	//FLATLINE?     DDrPatch_Int32( 0x004B24D2, FLrSpawnHack);
279	+
280	+	//FLATLINE?     DDrPatch_NOOP(0x004C26CB, 6);
281	+
282	+	//FLATLINE?     DDrPatch_MakeCall( 0x004C26CB, FLrHook_DoorOpen);
283	+	//FLATLINE?     DDrPatch_MakeCall( 0x004EE3CF, FLrHook_ConsoleActivate);
284		return true;
285		}
286
287	<	enum {s_unknown, s_patch, s_language} ini_section;
287	>	enum {s_unknown, s_options, s_patch, s_bsl, s_language} ini_section;
288
289		bool DDrIniCallback(char* section, bool newsection, char* name, char* value)
290		{
291		if (newsection)
292		{
293	<	if (!stricmp(section, "patch"))
293	>	if (!_stricmp(section, "options"))
294	>	ini_section = s_options;
295	>	else if (!_stricmp(section, "patch"))
296		ini_section = s_patch;
297	<	else if (!stricmp(section, "language"))
297	>	else if (!_stricmp(section, "bsl"))
298	>	ini_section = s_bsl;
299	>	else if (!_stricmp(section, "language"))
300		ini_section = s_language;
301		else
302		{
303		ini_section = s_unknown;
304	<	DDrStartupMessage("unrecognised ini section \"%s\"", section);
304	>	DDrStartupMessage("unrecognised section \"%s\"", section);
305		}
306		}
307
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");
333	+	//else if (!_stricmp(name, "devmode"))
334	+	//turn_dev_mode_on = !_stricmp(inifile_cleanstr(value), "true");
335	+	else
336	+	DDrStartupMessage("unrecognised option \"%s\"", name);
337	+	break;
338		case s_patch:
339	<	if (!stricmp(name, "fonttexturecache"))
340	<	patch_fonttexturecache = !stricmp(value, "true");
341	<	else if (!stricmp(name, "largetextures"))
342	<	patch_largetextures = !stricmp(value, "true");
343	<	else if (!stricmp(name, "levelplugins"))
344	<	patch_levelplugins = !stricmp(value, "true");
345	<	else if (!stricmp(name, "pathfinding"))
346	<	patch_pathfinding = !stricmp(value, "true");
347	<	else if (!stricmp(name, "projaware"))
348	<	patch_projaware = !stricmp(value, "true");
349	<	else if (!stricmp(name, "directinput"))
350	<	patch_directinput = !stricmp(value, "true");
351	<	else if (!stricmp(name, "wpfadetime"))
352	<	patch_wpfadetime = !stricmp(value, "true");
353	<	else if (!stricmp(name, "kickguns"))
354	<	patch_kickguns = !stricmp(value, "true");
355	<	else if (!stricmp(name, "cooldowntimer"))
356	<	patch_cooldowntimer = !stricmp(value, "true");
357	<	else if (!stricmp(name, "throwtest"))
358	<	patch_throwtest = !stricmp(value, "true");
359	<	else if (!stricmp(name, "alttab"))
360	<	patch_alttab = !stricmp(value, "true");
361	<	else if (!stricmp(name, "particledisablebit"))
362	<	patch_particledisablebit = !stricmp(value, "true");
363	<	else if (!stricmp(name, "multibyte"))
364	<	patch_multibyte = !stricmp(value, "true");
365	<	else if (!stricmp(name, "cheattable"))
366	<	patch_cheattable = !stricmp(value, "true");
367	<	else if (!stricmp(name, "safeprintf"))
368	<	patch_safeprintf = !stricmp(value, "true");
369	<	else if (!stricmp(name, "daodandisplayenum"))
370	<	patch_daodandisplayenum = !stricmp(value, "true");
371	<	else if (!stricmp(name, "usegettickcount"))
372	<	patch_usegettickcount = !stricmp(value, "true");
373	<	else if (!stricmp(name, "cheatsenabled"))
374	<	patch_cheatsenabled = !stricmp(value, "true");
375	<	else if (!stricmp(name, "usedaodangl"))
376	<	patch_usedaodangl = !stricmp(value, "true");
377	<	else if (!stricmp(name, "windowhack"))
378	<	patch_windowhack = !stricmp(value, "true");
339	>	if (!_stricmp(name, "fonttexturecache"))
340	>	patch_fonttexturecache = !_stricmp(inifile_cleanstr(value), "true");
341	>	else if (!_stricmp(name, "largetextures"))
342	>	patch_largetextures = !_stricmp(inifile_cleanstr(value), "true");
343	>	else if (!_stricmp(name, "levelplugins"))
344	>	patch_levelplugins = !_stricmp(inifile_cleanstr(value), "true");
345	>	else if (!_stricmp(name, "pathfinding"))
346	>	patch_pathfinding = !_stricmp(inifile_cleanstr(value), "true");
347	>	else if (!_stricmp(name, "projaware"))
348	>	patch_projaware = !_stricmp(inifile_cleanstr(value), "true");
349	>	else if (!_stricmp(name, "directinput"))
350	>	patch_directinput = !_stricmp(inifile_cleanstr(value), "true");
351	>	else if (!_stricmp(name, "wpfadetime"))
352	>	patch_wpfadetime = !_stricmp(inifile_cleanstr(value), "true");
353	>	else if (!_stricmp(name, "kickguns"))
354	>	patch_kickguns = !_stricmp(inifile_cleanstr(value), "true");
355	>	else if (!_stricmp(name, "cooldowntimer"))
356	>	patch_cooldowntimer = !_stricmp(inifile_cleanstr(value), "true");
357	>	else if (!_stricmp(name, "throwtest"))
358	>	patch_throwtest = !_stricmp(inifile_cleanstr(value), "true");
359	>	else if (!_stricmp(name, "alttab"))
360	>	patch_alttab = !_stricmp(inifile_cleanstr(value), "true");
361	>	else if (!_stricmp(name, "particledisablebit"))
362	>	patch_particledisablebit = !_stricmp(inifile_cleanstr(value), "true");
363	>	else if (!_stricmp(name, "multibyte"))
364	>	patch_multibyte = !_stricmp(inifile_cleanstr(value), "true");
365	>	else if (!_stricmp(name, "cheattable"))
366	>	patch_cheattable = !_stricmp(inifile_cleanstr(value), "true");
367	>	else if (!_stricmp(name, "argb8888"))
368	>	patch_argb8888 = !_stricmp(inifile_cleanstr(value), "true");
369	>	else if (!_stricmp(name, "killvtune"))
370	>	patch_killvtune = !_stricmp(inifile_cleanstr(value), "true");
371	>	else if (!_stricmp(name, "getcmdline"))
372	>	patch_getcmdline = !_stricmp(inifile_cleanstr(value), "true");
373	>	else if (!_stricmp(name, "disablecmdline"))
374	>	patch_disablecmdline = !_stricmp(inifile_cleanstr(value), "true");
375	>	else if (!_stricmp(name, "safeprintf"))
376	>	patch_safeprintf = !_stricmp(inifile_cleanstr(value), "true");
377	>	else if (!_stricmp(name, "daodandisplayenum"))
378	>	patch_daodandisplayenum = !_stricmp(inifile_cleanstr(value), "true");
379	>	else if (!_stricmp(name, "usegettickcount"))
380	>	patch_usegettickcount = !_stricmp(inifile_cleanstr(value), "true");
381	>	else if (!_stricmp(name, "cheatsenabled"))
382	>	patch_cheatsenabled = !_stricmp(inifile_cleanstr(value), "true");
383	>	else if (!_stricmp(name, "usedaodangl"))
384	>	patch_usedaodangl = !_stricmp(inifile_cleanstr(value), "true");
385	>	else if (!_stricmp(name, "windowhack"))
386	>	patch_windowhack = !_stricmp(inifile_cleanstr(value), "true");
387	>	else if (!_stricmp(name, "daodaninit"))
388	>	patch_daodaninit = !_stricmp(inifile_cleanstr(value), "true");
389	>	else if (!_stricmp(name, "bsl"))
390	>	patch_bsl = !_stricmp(inifile_cleanstr(value), "true");
391	>	else if (!_stricmp(name, "cheater"))
392	>	patch_cheater = !_stricmp(inifile_cleanstr(value), "true");
393	>	else if (!_stricmp(name, "newweap"))
394	>	patch_newweapon = !_stricmp(inifile_cleanstr(value), "true");
395		else
396		DDrStartupMessage("unrecognised patch \"%s\"", name);
397		break;
398		case s_language:
399	<	if (!stricmp(name, "savepoint"))
399	>	if (!_stricmp(name, "chinese"))
400	>	patch_chinese = true;
401	>	else if (!_stricmp(name, "savepoint"))
402		{
403	<	char* str = strdup(value);
403	>	char* str = _strdup(value);
404		DDrPatch_Int32(OniExe + 0x000fd730, (int)str);
405		DDrPatch_Int32(OniExe + 0x000fd738, (int)str);
406		}
407	<	else if (!stricmp(name, "syndicatewarehouse"))
407	>	else if (!_stricmp(name, "syndicatewarehouse"))
408		{
409	<	char* str = strdup(value);
409	>	char* str = _strdup(value);
410		DDrPatch_Int32(OniExe + 0x000fd71a, (int)str);
411		DDrPatch_Int32(OniExe + 0x0010ef75, (int)str);
412		}
413	<	else if (!stricmp(name, "damn"))
414	<	DDrPatch_StrDup(OniExe + 0x0010fb6e, value);
415	<	else if (!stricmp(name, "blam"))
416	<	DDrPatch_StrDup(OniExe + 0x0010fb73, value);
417	<	else if (!stricmp(name, "shapeshifter_on"))
418	<	DDr_CheatTable[0].message_on = strdup(value);
419	<	else if (!stricmp(name, "shapeshifter_off"))
420	<	DDr_CheatTable[0].message_off = strdup(value);
421	<	else if (!stricmp(name, "liveforever_on"))
422	<	DDr_CheatTable[1].message_on = strdup(value);
423	<	else if (!stricmp(name, "liveforever_off"))
424	<	DDr_CheatTable[1].message_off = strdup(value);
425	<	else if (!stricmp(name, "touchofdeath_on"))
426	<	DDr_CheatTable[2].message_on = strdup(value);
427	<	else if (!stricmp(name, "touchofdeath_off"))
428	<	DDr_CheatTable[2].message_off = strdup(value);
429	<	else if (!stricmp(name, "canttouchthis_on"))
430	<	DDr_CheatTable[3].message_on = strdup(value);
431	<	else if (!stricmp(name, "canttouchthis_off"))
432	<	DDr_CheatTable[3].message_off = strdup(value);
433	<	else if (!stricmp(name, "fatloot_on"))
434	<	DDr_CheatTable[4].message_on = strdup(value);
435	<	else if (!stricmp(name, "glassworld_on"))
436	<	DDr_CheatTable[5].message_on = strdup(value);
437	<	else if (!stricmp(name, "glassworld_off"))
438	<	DDr_CheatTable[5].message_off = strdup(value);
439	<	else if (!stricmp(name, "winlevel_on"))
440	<	DDr_CheatTable[6].message_on = strdup(value);
441	<	else if (!stricmp(name, "loselevel_on"))
442	<	DDr_CheatTable[7].message_on = strdup(value);
443	<	else if (!stricmp(name, "bighead_on"))
444	<	DDr_CheatTable[8].message_on = strdup(value);
445	<	else if (!stricmp(name, "bighead_off"))
446	<	DDr_CheatTable[8].message_off = strdup(value);
447	<	else if (!stricmp(name, "minime_on"))
448	<	DDr_CheatTable[9].message_on = strdup(value);
449	<	else if (!stricmp(name, "minime_off"))
450	<	DDr_CheatTable[9].message_off = strdup(value);
451	<	else if (!stricmp(name, "superammo_on"))
452	<	DDr_CheatTable[10].message_on = strdup(value);
453	<	else if (!stricmp(name, "superammo_off"))
454	<	DDr_CheatTable[10].message_off = strdup(value);
455	<	else if (!stricmp(name, "devmode_on"))
413	>	else if (!_stricmp(name, "damn"))
414	>	DDrPatch__strdup(OniExe + 0x0010fb6e, value);
415	>	else if (!_stricmp(name, "blam"))
416	>	DDrPatch__strdup(OniExe + 0x0010fb73, value);
417	>	else if (!_stricmp(name, "shapeshifter_on"))
418	>	DDr_CheatTable[0].message_on = _strdup(value);
419	>	else if (!_stricmp(name, "shapeshifter_off"))
420	>	DDr_CheatTable[0].message_off = _strdup(value);
421	>	else if (!_stricmp(name, "liveforever_on"))
422	>	DDr_CheatTable[1].message_on = _strdup(value);
423	>	else if (!_stricmp(name, "liveforever_off"))
424	>	DDr_CheatTable[1].message_off = _strdup(value);
425	>	else if (!_stricmp(name, "touchofdeath_on"))
426	>	DDr_CheatTable[2].message_on = _strdup(value);
427	>	else if (!_stricmp(name, "touchofdeath_off"))
428	>	DDr_CheatTable[2].message_off = _strdup(value);
429	>	else if (!_stricmp(name, "canttouchthis_on"))
430	>	DDr_CheatTable[3].message_on = _strdup(value);
431	>	else if (!_stricmp(name, "canttouchthis_off"))
432	>	DDr_CheatTable[3].message_off = _strdup(value);
433	>	else if (!_stricmp(name, "fatloot_on"))
434	>	DDr_CheatTable[4].message_on = _strdup(value);
435	>	else if (!_stricmp(name, "glassworld_on"))
436	>	DDr_CheatTable[5].message_on = _strdup(value);
437	>	else if (!_stricmp(name, "glassworld_off"))
438	>	DDr_CheatTable[5].message_off = _strdup(value);
439	>	else if (!_stricmp(name, "winlevel_on"))
440	>	DDr_CheatTable[6].message_on = _strdup(value);
441	>	else if (!_stricmp(name, "loselevel_on"))
442	>	DDr_CheatTable[7].message_on = _strdup(value);
443	>	else if (!_stricmp(name, "bighead_on"))
444	>	DDr_CheatTable[8].message_on = _strdup(value);
445	>	else if (!_stricmp(name, "bighead_off"))
446	>	DDr_CheatTable[8].message_off = _strdup(value);
447	>	else if (!_stricmp(name, "minime_on"))
448	>	DDr_CheatTable[9].message_on = _strdup(value);
449	>	else if (!_stricmp(name, "minime_off"))
450	>	DDr_CheatTable[9].message_off = _strdup(value);
451	>	else if (!_stricmp(name, "superammo_on"))
452	>	DDr_CheatTable[10].message_on = _strdup(value);
453	>	else if (!_stricmp(name, "superammo_off"))
454	>	DDr_CheatTable[10].message_off = _strdup(value);
455	>	else if (!_stricmp(name, "devmode_on"))
456		{
457	<	char* str = strdup(value);
457	>	char* str = _strdup(value);
458		DDr_CheatTable[11].message_on = str;
459	<	DDr_CheatTable[cheat_devmodex].message_on = str;
459	>	DDr_CheatTable[cheat_x].message_on = str;
460		}
461	<	else if (!stricmp(name, "devmode_off"))
461	>	else if (!_stricmp(name, "devmode_off"))
462		{
463	<	char* str = strdup(value);
463	>	char* str = _strdup(value);
464		DDr_CheatTable[11].message_off = str;
465	<	DDr_CheatTable[cheat_devmodex].message_off = str;
465	>	DDr_CheatTable[cheat_x].message_off = str;
466		}
467	<	else if (!stricmp(name, "reservoirdogs_on"))
468	<	DDr_CheatTable[12].message_on = strdup(value);
469	<	else if (!stricmp(name, "reservoirdogs_off"))
470	<	DDr_CheatTable[12].message_off = strdup(value);
471	<	else if (!stricmp(name, "roughjustice_on"))
472	<	DDr_CheatTable[13].message_on = strdup(value);
473	<	else if (!stricmp(name, "roughjustice_off"))
474	<	DDr_CheatTable[13].message_off = strdup(value);
475	<	else if (!stricmp(name, "chenille_on"))
476	<	DDr_CheatTable[14].message_on = strdup(value);
477	<	else if (!stricmp(name, "chenille_off"))
478	<	DDr_CheatTable[14].message_off = strdup(value);
479	<	else if (!stricmp(name, "behemoth_on"))
480	<	DDr_CheatTable[15].message_on = strdup(value);
481	<	else if (!stricmp(name, "behemoth_off"))
482	<	DDr_CheatTable[15].message_off = strdup(value);
483	<	else if (!stricmp(name, "elderrune_on"))
484	<	DDr_CheatTable[16].message_on = strdup(value);
485	<	else if (!stricmp(name, "elderrune_off"))
486	<	DDr_CheatTable[16].message_off = strdup(value);
487	<	else if (!stricmp(name, "moonshadow_on"))
488	<	DDr_CheatTable[17].message_on = strdup(value);
489	<	else if (!stricmp(name, "moonshadow_off"))
490	<	DDr_CheatTable[17].message_off = strdup(value);
491	<	else if (!stricmp(name, "munitionfrenzy_on"))
492	<	DDr_CheatTable[18].message_on = strdup(value);
493	<	else if (!stricmp(name, "fistsoflegend_on"))
494	<	DDr_CheatTable[19].message_on = strdup(value);
495	<	else if (!stricmp(name, "fistsoflegend_off"))
496	<	DDr_CheatTable[19].message_off = strdup(value);
497	<	else if (!stricmp(name, "killmequick_on"))
498	<	DDr_CheatTable[20].message_on = strdup(value);
499	<	else if (!stricmp(name, "killmequick_off"))
500	<	DDr_CheatTable[20].message_off = strdup(value);
501	<	else if (!stricmp(name, "carousel_on"))
502	<	DDr_CheatTable[21].message_on = strdup(value);
503	<	else if (!stricmp(name, "carousel_off"))
504	<	DDr_CheatTable[21].message_off = strdup(value);
467	>	else if (!_stricmp(name, "reservoirdogs_on"))
468	>	DDr_CheatTable[12].message_on = _strdup(value);
469	>	else if (!_stricmp(name, "reservoirdogs_off"))
470	>	DDr_CheatTable[12].message_off = _strdup(value);
471	>	else if (!_stricmp(name, "roughjustice_on"))
472	>	DDr_CheatTable[13].message_on = _strdup(value);
473	>	else if (!_stricmp(name, "roughjustice_off"))
474	>	DDr_CheatTable[13].message_off = _strdup(value);
475	>	else if (!_stricmp(name, "chenille_on"))
476	>	DDr_CheatTable[14].message_on = _strdup(value);
477	>	else if (!_stricmp(name, "chenille_off"))
478	>	DDr_CheatTable[14].message_off = _strdup(value);
479	>	else if (!_stricmp(name, "behemoth_on"))
480	>	DDr_CheatTable[15].message_on = _strdup(value);
481	>	else if (!_stricmp(name, "behemoth_off"))
482	>	DDr_CheatTable[15].message_off = _strdup(value);
483	>	else if (!_stricmp(name, "elderrune_on"))
484	>	DDr_CheatTable[16].message_on = _strdup(value);
485	>	else if (!_stricmp(name, "elderrune_off"))
486	>	DDr_CheatTable[16].message_off = _strdup(value);
487	>	else if (!_stricmp(name, "moonshadow_on"))
488	>	DDr_CheatTable[17].message_on = _strdup(value);
489	>	else if (!_stricmp(name, "moonshadow_off"))
490	>	DDr_CheatTable[17].message_off = _strdup(value);
491	>	else if (!_stricmp(name, "munitionfrenzy_on"))
492	>	DDr_CheatTable[18].message_on = _strdup(value);
493	>	else if (!_stricmp(name, "fistsoflegend_on"))
494	>	DDr_CheatTable[19].message_on = _strdup(value);
495	>	else if (!_stricmp(name, "fistsoflegend_off"))
496	>	DDr_CheatTable[19].message_off = _strdup(value);
497	>	else if (!_stricmp(name, "killmequick_on"))
498	>	DDr_CheatTable[20].message_on = _strdup(value);
499	>	else if (!_stricmp(name, "killmequick_off"))
500	>	DDr_CheatTable[20].message_off = _strdup(value);
501	>	else if (!_stricmp(name, "carousel_on"))
502	>	DDr_CheatTable[21].message_on = _strdup(value);
503	>	else if (!_stricmp(name, "carousel_off"))
504	>	DDr_CheatTable[21].message_off = _strdup(value);
505		else
506		DDrStartupMessage("unrecognised language item \"%s\"", name);
507		break;
508	+	case s_bsl:
509		default:
510		break;
511		}
#	Line 337 | Line 515 | bool DDrIniCallback(char* section, bool
515
516		void DDrConfig()
517		{
518	+
519		if (GetFileAttributes("daodan.ini") == INVALID_FILE_ATTRIBUTES)
520		{
521	+	FILE* fp;
522		DDrStartupMessage("daodan.ini doesn't exist, creating");
523	<	FILE* fp = fopen("daodan.ini", "w");
523	>	fp = fopen("daodan.ini", "w");
524		if (fp)
525		{
526		fputs("[Options]\n", fp);
#	Line 354 | Line 534 | void DDrConfig()
534		DDrStartupMessage("finished parsing");
535		}
536
537	+	void ONICALL DDrGame_Init()
538	+	{
539	+	if (opt_usedaodanbsl)
540	+	SLrDaodan_Initalize();
541	+	}
542	+
543	+	void DDrException() {
544	+	int* i = 0;
545	+	*i = 1;
546	+	}
547	+	#include <stdio.h>
548	+
549	+	//this was broken
550	+	FILE** _UUgError_WarningFile = (FILE**)0x005711B4;
551	+	FILE *__fastcall DDrPrintWarning(int filename, int linenumber, unsigned __int16 errornum, int message)
552	+	{
553	+
554	+	FILE *v4; // eax@1
555	+	FILE *result; // eax@4
556	+	char v6[512]; // [sp+0h] [bp-100h]@1
557	+	FILE* UUgError_WarningFile = *_UUgError_WarningFile;
558	+	sprintf_s(
559	+	v6, 512,
560	+	"Error %x reported from File: %s, Line: %d (message follows) \r\n%s",
561	+	errornum,
562	+	filename,
563	+	linenumber,
564	+	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	+	//oni_fprintf(stdout, v6);
573	+	//sprintf(&v6, "%s", message);
574	+	*_UUgError_WarningFile = UUgError_WarningFile;
575	+	result = UUgError_WarningFile;
576	+	return result;
577	+	}
578	+
579		void __cdecl DDrMain(int argc, char* argv[])
580		{
581	+	int i;
582	+	char* section;
583	+	char* option;
584	+	bool falseoption;
585	+
586		DDrStartupMessage("daodan attached!");
587	+
588	+	opt_ignore_private_data = false;
589	+	opt_sound = true;
590	+
591		DDrConfig();
592	+	DDrStartupMessage("parsing command line...");
593	+	for (i = 1; i < argc; i ++)
594	+	{
595	+	if (argv[i][0] == '-')
596	+	{
597	+	section = argv[i] + 1;
598	+	if ((option = strchr(argv[i], '.')))
599	+	{
600	+	*option = '\0';
601	+	falseoption = (option[1] == 'n' || option[1] == 'N') && (option[2] = 'o' || option[2] == 'O');
602	+	if (i < (argc - 1) && argv[i + 1][0] != '-')
603	+	DDrIniCallback(section, true, option + 1, argv[++i]);
604	+	else
605	+	DDrIniCallback(section, true, option + (falseoption ? 3 : 1), (falseoption ? "false" : "true"));
606	+	*option = '.';
607	+	}
608	+	else
609	+	{
610	+	falseoption = (section[0] == 'n' || section[0] == 'N') && (section[1] = 'o' || section[1] == 'O');
611	+	ini_section = s_options;
612	+	if (i < (argc - 1) && argv[i + 1][0] != '-')
613	+	DDrIniCallback(NULL, false, section, argv[++i]);
614	+	else
615	+	DDrIniCallback(NULL, false, section + (falseoption ? 2 : 0), (falseoption ? "false" : "true"));
616	+	}
617	+	}
618	+	else
619	+	{
620	+	DDrStartupMessage("parse error \"%s\"", argv[i]);
621	+	break;
622	+	}
623	+	}
624	+	DDrStartupMessage("finished parsing");
625		DDrPatch_Init();
626
627		// Safe startup message printer
#	Line 375 | Line 639 | void __cdecl DDrMain(int argc, char* arg
639		DDrPatch_MakeJump(UUrMachineTime_High_Frequency, DDrMachineTime_High_Frequency);
640		DDrPatch_MakeJump(UUrMachineTime_Sixtieths, DDrMachineTime_Sixtieths);
641		}
642	<
642	>
643		// Cheats always enabled
644		if (patch_cheatsenabled)
645		DDrPatch_MakeJump(ONrPersist_GetWonGame, DDrPersist_GetWonGame);
646	<
646	>
647		// Windowed mode
648		if (patch_usedaodangl)
649		{
650	+	DDrPatch_NOOP((char*)0x004032B7, 6);
651	+	DDrPatch_MakeCall((char*)0x004032B7, LIiP_SetCursorPosHook);
652	+
653	+	DDrPatch_NOOP((char*)0x00403349, 6);
654	+	DDrPatch_MakeCall((char*)0x00403349, LIiP_SetCursorPosHook);
655		DDrPatch_MakeJump(ONrPlatform_Initialize, DDrPlatform_Initialize);
656		DDrPatch_MakeJump(gl_platform_initialize, daodangl_platform_initialize);
657		}
389	–
658		// Hacked windowed mode (for when daodangl isn't working properly)
659	<	if (patch_windowhack)
659	>	else if (patch_windowhack)
660		DDrWindowHack_Install();
661
662	<	init_daodan_gl();
662	>	if (patch_daodaninit)
663	>	DDrPatch_MakeCall(OniExe + 0x000d345a, DDrGame_Init);
664
665	<	ONiMain(argc, argv);
666	<	}
665	>	// Patches for existing BSL functions
666	>	if (patch_bsl)
667	>	SLrDaodan_Patch();
668	>
669	>	if (patch_cheater)
670	>	{
671	>	DDrPatch_MakeCall(OniExe + 0x000f618f, DDrCheater);
672	>	DDrPatch_Int16(OniExe + 0x000deb45, 0x5590);
673	>	#if 1
674	>	DDrPatch_MakeCall(OniExe + 0x000deb47, FallingFrames);
675	>	#endif
676	>	DDrPatch_MakeJump(OniExe + 0x0010f021, DDrCheater_LevelLoad);
677	>	}
678
679	+	//DDrPatch_MakeJump(0x004378c0, DDrException);
680	+	DDrPatch_MakeJump(0x004245A0, DDrPrintWarning);
681	+	//init_daodan_gl();
682	+
683	+	ONiMain(argc, argv);
684	+	}
685	+	/*
686	+	void DDrWrongExe()
687	+	{
688	+	switch (MessageBox(NULL, "This version of the Daodan DLL is incompatible with your Oni.exe.\n"
689	+	"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))
690	+	{
691	+	case IDOK:
692	+	{
693	+	STARTUPINFO si;
694	+	PROCESS_INFORMATION pi;
695	+	FillMemory(&si, 0, sizeof(si));
696	+	FillMemory(&pi, 0, sizeof(pi));
697	+	si.cb = sizeof(si);
698	+	if (!CreateProcess(NULL, "cmd /c \"start http://wiki.oni2.net/Daodan_DLL\"", NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
699	+	MessageBox(NULL, "", "", 0);
700	+	CloseHandle(pi.hProcess);
701	+	CloseHandle(pi.hThread);
702	+	}
703	+	default:
704	+	ExitProcess(0);
705	+	}
706	+	}
707	+	*/
708		BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
709		{
710		switch (fdwReason)
#	Line 404 | Line 713 | BOOL WINAPI DllMain(HINSTANCE hinstDLL,
713		DDrDLLModule = hinstDLL;
714		DDrONiModule = GetModuleHandle(NULL);
715
716	<	DDrPatch_MakeCall(OniExe + 0x0010fb49, DDrMain);
717	<
716	>	if (*(uint32_t*)(OniExe + 0x0011acd0) == 0x09d36852)
717	>	DDrPatch_MakeCall(OniExe + 0x0010fb49, DDrMain);
718	>	else
719	>	ExitProcess(0);
720		break;
721		}
722		return TRUE;

Diff Legend

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