ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/Daodan/src/Daodan.c

Comparing Daodan/src/Daodan.c (file contents):
Revision 693 by alloc, Thu Mar 7 22:38:21 2013 UTC vs.
Revision 838 by alloc, Mon Apr 29 16:29:16 2013 UTC

#	Line 1 | Line 1
1		#include <windows.h>
2		#include <string.h>
3	+	#include <stdio.h>
4
5		#include "Daodan.h"
6		#include "Daodan_Patch.h"
#	Line 9 | Line 10
10		#include "Daodan_Persistence.h"
11		#include "Daodan_BSL.h"
12		#include "Daodan_Console.h"
13	<	#include "Daodan_WindowHack.h"
13	>	#include "Daodan_Config.h"
14
15		#include "Oni.h"
16
17		#include "Oni_GL.h"
18		#include "Daodan_GL.h"
19
19	–	#include "Inifile_Reader.h"
20	–
20		HMODULE DDrDLLModule;
21		HMODULE DDrONiModule;
22
23	<	bool patch_fonttexturecache = true;
25	<	bool patch_largetextures = true;
26	<	bool patch_levelplugins = true;
27	<	bool patch_pathfinding = true;
28	<	bool patch_projaware = true;
29	<	bool patch_directinput = true;
30	<	bool patch_wpfadetime = true;
31	<	bool patch_kickguns = false;
32	<	bool patch_cooldowntimer = true;
33	<	bool patch_throwtest = false;
34	<	bool patch_alttab = true;
35	<	bool patch_particledisablebit = false;
36	<	bool patch_multibyte = false;
37	<	bool patch_cheattable = true;
38	<	bool patch_argb8888 = true;
39	<	bool patch_killvtune = true;
40	<	bool patch_getcmdline = true;
41	<	bool patch_disablecmdline = true;
42	<	bool patch_optionsvisible = true;
43	<
44	<	bool patch_safeprintf = true;
45	<	bool patch_daodandisplayenum = true;
46	<	bool patch_usegettickcount = true;
47	<	bool patch_cheatsenabled = true;
48	<	bool patch_usedaodangl = false;
49	<	bool patch_windowhack = true;
50	<	bool patch_daodaninit = true;
51	<	bool patch_bsl = true;
52	<	bool patch_cheater = true;
53	<	bool patch_newweapon = true;
54	<	bool opt_usedaodanbsl = true;
55	<	bool opt_border = true;
56	<	bool opt_topmost = false;
57	<
58	<	typedef int (__cdecl *CHINESEPROC)(DWORD WINAPI);
59	<	bool patch_chinese = false;
23	>	typedef int (__cdecl *CHINESEPROC)(DWORD ThreadId);
24
25	<
26	<
27	<	void ONICALL DDrShowResumeButton(int window, int visibility)
25	>	// Hooked WMrSlider_SetRange() in ONiOGU_Options_InitDialog. Disables a gamma
26	>	// slider in windowed mode.
27	>	static void ONICALL DD_ONiOGU_GammaSlider_SetRange(WMtWindow* window, int min_value, int max_value)
28	>	{
29	>	WMrWindow_SetEnabled(window, M3gResolutionSwitch && opt_gamma);
30	>	WMrSlider_SetRange(window, min_value, max_value);
31	>	}
32	>
33	>	void ONICALL DDrShowResumeButton(WMtWindow* window, int visibility)
34		{
35		if (visibility)
36		WMrWindow_SetLocation(window, 150, 350);
#	Line 69 | Line 39 | void ONICALL DDrShowResumeButton(int win
39
40
41		/* Options always visible patch */
42	<	void ONICALL DDrShowOptionsButton(int window, int visibility)
42	>	void ONICALL DDrShowOptionsButton(WMtWindow* window, int visibility)
43		{
44		WMrWindow_SetVisible(window, 1);
45		}
46
47	+	void ONICALL DDrGame_Init()
48	+	{
49	+	if (opt_usedaodanbsl)
50	+	SLrDaodan_Initialize();
51	+	}
52	+
53	+
54	+	//this was broken
55	+	FILE** _UUgError_WarningFile = (FILE**)0x005711B4;
56	+	FILE *__fastcall DDrPrintWarning(int filename, int linenumber, unsigned __int16 errornum, int message)
57	+	{
58	+
59	+	FILE *v4; // eax@1
60	+	FILE *result; // eax@4
61	+	char v6[512]; // [sp+0h] [bp-100h]@1
62	+	FILE* UUgError_WarningFile = *_UUgError_WarningFile;
63	+
64	+	if (filename && message && (strlen((const char*)filename)+strlen((const char*)message))<420) {
65	+	sprintf(
66	+	v6,
67	+	"Error %x reported from File: %s, Line: %d (message follows) \r\n%s",
68	+	errornum,
69	+	(const char*)filename,
70	+	linenumber,
71	+	(const char*)message);
72	+
73	+	if ( UUgError_WarningFile
74	+	|| (UUgError_WarningFile = oni_fopen("debugger.txt", "wb"), UUgError_WarningFile ) )
75	+	{
76	+	oni_fprintf(UUgError_WarningFile, "%s\r\n", v6);
77	+	oni_fflush(UUgError_WarningFile);
78	+	}
79	+	}
80	+	//oni_fprintf(stdout, v6);
81	+	//sprintf(&v6, "%s", message);
82	+	*_UUgError_WarningFile = UUgError_WarningFile;
83	+	result = UUgError_WarningFile;
84	+	return result;
85	+	}
86
87
88		bool DDrPatch_Init()
89		{
90	<	DDrStartupMessage("patching engine");
90	>	DDrStartupMessage("Daodan: Patching engine");
91
92		// Font texture cache doubled
93		if (patch_fonttexturecache)
#	Line 207 | Line 216 | bool DDrPatch_Init()
216		//Test newweap patch
217		if (patch_newweapon) {
218
219	<	//Makes it always say "Recieved weapon_name."
219	>	//Makes it always say "Received weapon_name."
220		//Needs check for loc_4DFC66
221		//DDrPatch_NOOP((char*)(OniExe + 0x000E4DF8),2);
222
#	Line 254 | Line 263 | bool DDrPatch_Init()
263
264		if(patch_chinese)
265		{
266	<	HMODULE dll = LoadLibrary("xfhsm_oni.dll");
258	<	if( dll )
266	>	if (GetFileAttributes("xfhsm_oni.dll") != INVALID_FILE_ATTRIBUTES)
267		{
268	<	void* proc = GetProcAddress( dll, "InstallHook" );
269	<	if(proc)
268	>	HMODULE dll;
269	>	DWORD err;
270	>
271	>	DDrStartupMessage("Daodan: Loading chinese DLL");
272	>	dll = LoadLibrary("xfhsm_oni.dll");
273	>	err = GetLastError();
274	>	if( dll )
275		{
276	<	((CHINESEPROC)proc)(GetCurrentThreadId());
276	>	void* proc = GetProcAddress( dll, "InstallHook" );
277	>	if(proc)
278	>	{
279	>	((CHINESEPROC)proc)(GetCurrentThreadId());
280	>	}
281	>	} else {
282	>	char msg[100];
283	>	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, 0, msg, 100, NULL);
284	>	DDrStartupMessage("Daodan: Loading DLL failed with error %i: %s", err, msg);
285		}
286		}
287		}
#	Line 308 | Line 329 | bool DDrPatch_Init()
329		DDrPatch_MakeCall((void*)(OniExe + 0x000d2d43), DDrShowResumeButton);
330		}
331
332	<	return true;
333	<	}
334	<
335	<
336	<	enum {s_unknown, s_options, s_patch, s_bsl, s_language} ini_section;
337	<
338	<	bool DDrIniCallback(char* section, bool newsection, char* name, char* value)
339	<	{
340	<	if (newsection)
341	<	{
342	<	if (!_stricmp(section, "options"))
343	<	ini_section = s_options;
344	<	else if (!_stricmp(section, "patch"))
345	<	ini_section = s_patch;
346	<	else if (!_stricmp(section, "bsl"))
347	<	ini_section = s_bsl;
327	<	else if (!_stricmp(section, "language"))
328	<	ini_section = s_language;
329	<	else
330	<	{
331	<	ini_section = s_unknown;
332	<	DDrStartupMessage("unrecognised section \"%s\"", section);
333	<	}
334	<	}
335	<
336	<	switch (ini_section)
337	<	{
338	<	case s_options:
339	<	if (!_stricmp(name, "usedaodanbsl"))
340	<	opt_usedaodanbsl = !_stricmp(inifile_cleanstr(value), "true");
341	<	else if (!_stricmp(name, "border"))
342	<	opt_border = !_stricmp(inifile_cleanstr(value), "true");
343	<	else if (!_stricmp(name, "topmost"))
344	<	opt_topmost = !_stricmp(inifile_cleanstr(value), "true");
345	<	else if (!_stricmp(name, "multibyte"))
346	<	patch_multibyte = !_stricmp(inifile_cleanstr(value), "true");
347	<	else if (!_stricmp(name, "debug"))
348	<	AKgDebug_DebugMaps = !_stricmp(inifile_cleanstr(value), "true");
349	<	else if (!_stricmp(name, "debugfiles"))
350	<	BFgDebugFileEnable = !_stricmp(inifile_cleanstr(value), "true");
351	<	else if (!_stricmp(name, "findsounds"))
352	<	SSgSearchOnDisk = !_stricmp(inifile_cleanstr(value), "true");
353	<	else if (!_stricmp(name, "ignore_private_data"))
354	<	opt_ignore_private_data = !_stricmp(inifile_cleanstr(value), "true");
355	<	else if (!_stricmp(name, "sound"))
356	<	opt_sound = !_stricmp(inifile_cleanstr(value), "true");
357	<	else if (!_stricmp(name, "switch"))
358	<	M3gResolutionSwitch = !_stricmp(inifile_cleanstr(value), "true");
359	<	else
360	<	DDrStartupMessage("unrecognised option \"%s\"", name);
361	<	break;
362	<	case s_patch:
363	<	if (!_stricmp(name, "fonttexturecache"))
364	<	patch_fonttexturecache = !_stricmp(inifile_cleanstr(value), "true");
365	<	else if (!_stricmp(name, "largetextures"))
366	<	patch_largetextures = !_stricmp(inifile_cleanstr(value), "true");
367	<	else if (!_stricmp(name, "levelplugins"))
368	<	patch_levelplugins = !_stricmp(inifile_cleanstr(value), "true");
369	<	else if (!_stricmp(name, "pathfinding"))
370	<	patch_pathfinding = !_stricmp(inifile_cleanstr(value), "true");
371	<	else if (!_stricmp(name, "projaware"))
372	<	patch_projaware = !_stricmp(inifile_cleanstr(value), "true");
373	<	else if (!_stricmp(name, "directinput"))
374	<	patch_directinput = !_stricmp(inifile_cleanstr(value), "true");
375	<	else if (!_stricmp(name, "wpfadetime"))
376	<	patch_wpfadetime = !_stricmp(inifile_cleanstr(value), "true");
377	<	else if (!_stricmp(name, "kickguns"))
378	<	patch_kickguns = !_stricmp(inifile_cleanstr(value), "true");
379	<	else if (!_stricmp(name, "cooldowntimer"))
380	<	patch_cooldowntimer = !_stricmp(inifile_cleanstr(value), "true");
381	<	else if (!_stricmp(name, "throwtest"))
382	<	patch_throwtest = !_stricmp(inifile_cleanstr(value), "true");
383	<	else if (!_stricmp(name, "alttab"))
384	<	patch_alttab = !_stricmp(inifile_cleanstr(value), "true");
385	<	else if (!_stricmp(name, "particledisablebit"))
386	<	patch_particledisablebit = !_stricmp(inifile_cleanstr(value), "true");
387	<	else if (!_stricmp(name, "multibyte"))
388	<	patch_multibyte = !_stricmp(inifile_cleanstr(value), "true");
389	<	else if (!_stricmp(name, "cheattable"))
390	<	patch_cheattable = !_stricmp(inifile_cleanstr(value), "true");
391	<	else if (!_stricmp(name, "argb8888"))
392	<	patch_argb8888 = !_stricmp(inifile_cleanstr(value), "true");
393	<	else if (!_stricmp(name, "killvtune"))
394	<	patch_killvtune = !_stricmp(inifile_cleanstr(value), "true");
395	<	else if (!_stricmp(name, "getcmdline"))
396	<	patch_getcmdline = !_stricmp(inifile_cleanstr(value), "true");
397	<	else if (!_stricmp(name, "disablecmdline"))
398	<	patch_disablecmdline = !_stricmp(inifile_cleanstr(value), "true");
399	<	else if (!_stricmp(name, "safeprintf"))
400	<	patch_safeprintf = !_stricmp(inifile_cleanstr(value), "true");
401	<	else if (!_stricmp(name, "daodandisplayenum"))
402	<	patch_daodandisplayenum = !_stricmp(inifile_cleanstr(value), "true");
403	<	else if (!_stricmp(name, "usegettickcount"))
404	<	patch_usegettickcount = !_stricmp(inifile_cleanstr(value), "true");
405	<	else if (!_stricmp(name, "cheatsenabled"))
406	<	patch_cheatsenabled = !_stricmp(inifile_cleanstr(value), "true");
407	<	else if (!_stricmp(name, "usedaodangl"))
408	<	patch_usedaodangl = !_stricmp(inifile_cleanstr(value), "true");
409	<	else if (!_stricmp(name, "windowhack"))
410	<	patch_windowhack = !_stricmp(inifile_cleanstr(value), "true");
411	<	else if (!_stricmp(name, "daodaninit"))
412	<	patch_daodaninit = !_stricmp(inifile_cleanstr(value), "true");
413	<	else if (!_stricmp(name, "bsl"))
414	<	patch_bsl = !_stricmp(inifile_cleanstr(value), "true");
415	<	else if (!_stricmp(name, "cheater"))
416	<	patch_cheater = !_stricmp(inifile_cleanstr(value), "true");
417	<	else if (!_stricmp(name, "newweap"))
418	<	patch_newweapon = !_stricmp(inifile_cleanstr(value), "true");
419	<	else if (!_stricmp(name, "optionsvisible"))
420	<	patch_optionsvisible = !_stricmp(inifile_cleanstr(value), "true");
421	<	else
422	<	DDrStartupMessage("unrecognised patch \"%s\"", name);
423	<	break;
424	<	case s_language:
425	<	if (!_stricmp(name, "chinese"))
426	<	patch_chinese = true;
427	<	else if (!_stricmp(name, "savepoint"))
428	<	{
429	<	char* str = _strdup(value);
430	<	DDrPatch_Int32((int*)(OniExe + 0x000fd730), (int)str);
431	<	DDrPatch_Int32((int*)(OniExe + 0x000fd738), (int)str);
432	<	}
433	<	else if (!_stricmp(name, "syndicatewarehouse"))
434	<	{
435	<	char* str = _strdup(value);
436	<	DDrPatch_Int32((int*)(OniExe + 0x000fd71a), (int)str);
437	<	DDrPatch_Int32((int*)(OniExe + 0x0010ef75), (int)str);
438	<	}
439	<	else if (!_stricmp(name, "damn"))
440	<	DDrPatch__strdup((int*)(OniExe + 0x0010fb6e), value);
441	<	else if (!_stricmp(name, "blam"))
442	<	DDrPatch__strdup((int*)(OniExe + 0x0010fb73), value);
443	<	else if (!_stricmp(name, "shapeshifter_on"))
444	<	DDr_CheatTable[0].message_on = _strdup(value);
445	<	else if (!_stricmp(name, "shapeshifter_off"))
446	<	DDr_CheatTable[0].message_off = _strdup(value);
447	<	else if (!_stricmp(name, "liveforever_on"))
448	<	DDr_CheatTable[1].message_on = _strdup(value);
449	<	else if (!_stricmp(name, "liveforever_off"))
450	<	DDr_CheatTable[1].message_off = _strdup(value);
451	<	else if (!_stricmp(name, "touchofdeath_on"))
452	<	DDr_CheatTable[2].message_on = _strdup(value);
453	<	else if (!_stricmp(name, "touchofdeath_off"))
454	<	DDr_CheatTable[2].message_off = _strdup(value);
455	<	else if (!_stricmp(name, "canttouchthis_on"))
456	<	DDr_CheatTable[3].message_on = _strdup(value);
457	<	else if (!_stricmp(name, "canttouchthis_off"))
458	<	DDr_CheatTable[3].message_off = _strdup(value);
459	<	else if (!_stricmp(name, "fatloot_on"))
460	<	DDr_CheatTable[4].message_on = _strdup(value);
461	<	else if (!_stricmp(name, "glassworld_on"))
462	<	DDr_CheatTable[5].message_on = _strdup(value);
463	<	else if (!_stricmp(name, "glassworld_off"))
464	<	DDr_CheatTable[5].message_off = _strdup(value);
465	<	else if (!_stricmp(name, "winlevel_on"))
466	<	DDr_CheatTable[6].message_on = _strdup(value);
467	<	else if (!_stricmp(name, "loselevel_on"))
468	<	DDr_CheatTable[7].message_on = _strdup(value);
469	<	else if (!_stricmp(name, "bighead_on"))
470	<	DDr_CheatTable[8].message_on = _strdup(value);
471	<	else if (!_stricmp(name, "bighead_off"))
472	<	DDr_CheatTable[8].message_off = _strdup(value);
473	<	else if (!_stricmp(name, "minime_on"))
474	<	DDr_CheatTable[9].message_on = _strdup(value);
475	<	else if (!_stricmp(name, "minime_off"))
476	<	DDr_CheatTable[9].message_off = _strdup(value);
477	<	else if (!_stricmp(name, "superammo_on"))
478	<	DDr_CheatTable[10].message_on = _strdup(value);
479	<	else if (!_stricmp(name, "superammo_off"))
480	<	DDr_CheatTable[10].message_off = _strdup(value);
481	<	else if (!_stricmp(name, "devmode_on"))
482	<	{
483	<	char* str = _strdup(value);
484	<	DDr_CheatTable[11].message_on = str;
485	<	DDr_CheatTable[cheat_x].message_on = str;
486	<	}
487	<	else if (!_stricmp(name, "devmode_off"))
488	<	{
489	<	char* str = _strdup(value);
490	<	DDr_CheatTable[11].message_off = str;
491	<	DDr_CheatTable[cheat_x].message_off = str;
492	<	}
493	<	else if (!_stricmp(name, "reservoirdogs_on"))
494	<	DDr_CheatTable[12].message_on = _strdup(value);
495	<	else if (!_stricmp(name, "reservoirdogs_off"))
496	<	DDr_CheatTable[12].message_off = _strdup(value);
497	<	else if (!_stricmp(name, "roughjustice_on"))
498	<	DDr_CheatTable[13].message_on = _strdup(value);
499	<	else if (!_stricmp(name, "roughjustice_off"))
500	<	DDr_CheatTable[13].message_off = _strdup(value);
501	<	else if (!_stricmp(name, "chenille_on"))
502	<	DDr_CheatTable[14].message_on = _strdup(value);
503	<	else if (!_stricmp(name, "chenille_off"))
504	<	DDr_CheatTable[14].message_off = _strdup(value);
505	<	else if (!_stricmp(name, "behemoth_on"))
506	<	DDr_CheatTable[15].message_on = _strdup(value);
507	<	else if (!_stricmp(name, "behemoth_off"))
508	<	DDr_CheatTable[15].message_off = _strdup(value);
509	<	else if (!_stricmp(name, "elderrune_on"))
510	<	DDr_CheatTable[16].message_on = _strdup(value);
511	<	else if (!_stricmp(name, "elderrune_off"))
512	<	DDr_CheatTable[16].message_off = _strdup(value);
513	<	else if (!_stricmp(name, "moonshadow_on"))
514	<	DDr_CheatTable[17].message_on = _strdup(value);
515	<	else if (!_stricmp(name, "moonshadow_off"))
516	<	DDr_CheatTable[17].message_off = _strdup(value);
517	<	else if (!_stricmp(name, "munitionfrenzy_on"))
518	<	DDr_CheatTable[18].message_on = _strdup(value);
519	<	else if (!_stricmp(name, "fistsoflegend_on"))
520	<	DDr_CheatTable[19].message_on = _strdup(value);
521	<	else if (!_stricmp(name, "fistsoflegend_off"))
522	<	DDr_CheatTable[19].message_off = _strdup(value);
523	<	else if (!_stricmp(name, "killmequick_on"))
524	<	DDr_CheatTable[20].message_on = _strdup(value);
525	<	else if (!_stricmp(name, "killmequick_off"))
526	<	DDr_CheatTable[20].message_off = _strdup(value);
527	<	else if (!_stricmp(name, "carousel_on"))
528	<	DDr_CheatTable[21].message_on = _strdup(value);
529	<	else if (!_stricmp(name, "carousel_off"))
530	<	DDr_CheatTable[21].message_off = _strdup(value);
531	<	else
532	<	DDrStartupMessage("unrecognised language item \"%s\"", name);
533	<	break;
534	<	case s_bsl:
535	<	default:
536	<	break;
537	<	}
538	<
539	<	return true;
540	<	}
541	<
542	<	void DDrConfig()
543	<	{
544	<
545	<	if (GetFileAttributes("daodan.ini") == INVALID_FILE_ATTRIBUTES)
546	<	{
547	<	FILE* fp;
548	<	DDrStartupMessage("daodan.ini doesn't exist, creating");
549	<	fp = fopen("daodan.ini", "w");
550	<	if (fp)
551	<	{
552	<	fputs("[Options]\n", fp);
553	<	fclose(fp);
554	<	}
555	<	}
556	<
557	<	DDrStartupMessage("parsing daodan.ini...");
558	<	if (!inifile_read("daodan.ini", DDrIniCallback))
559	<	DDrStartupMessage("error reading daodan.ini, check your syntax!");
560	<	DDrStartupMessage("finished parsing");
561	<	}
332	>	// Fix BinkBufferInit() call in BKrMovie_Play() to use GDI (DIB) blitting
333	>	// instead of DirectDraw; patch ONiRunGame to use the same method to play
334	>	// outro (ie., BKrMovie_Play() instead of ONrMovie_Play_Hardware() as the
335	>	// latter has problems on WINE).
336	>	if (patch_binkplay)
337	>	{
338	>	// push BINKBUFFERAUTO -> push BINKBUFFERDIBSECTION.
339	>	DDrPatch_Byte((void*)(OniExe + 0x0008829b + 1), 0x02);
340	>	// call ONrMovie_Play_Hardware -> call ONrMovie_Play
341	>	DDrPatch_MakeCall((void*)(OniExe + 0x000d496f), ONrMovie_Play);
342	>	}
343	>
344	>	// Patch a gamma slider in Options dialog (unconditionally).
345	>	// ONiOGU_Options_InitDialog: replace WMrSlider_SetRange(gammaSliderWindow, ...)
346	>	// call with our hook function.
347	>	DDrPatch_MakeCall((void*)(OniExe + 0x000d262c), (void*)DD_ONiOGU_GammaSlider_SetRange);
348
563	–	void ONICALL DDrGame_Init()
564	–	{
565	–	if (opt_usedaodanbsl)
566	–	SLrDaodan_Initalize();
567	–	}
568	–
569	–	void DDrException() {
570	–	int* i = 0;
571	–	*i = 1;
572	–	}
573	–	#include <stdio.h>
574	–
575	–	//this was broken
576	–	FILE** _UUgError_WarningFile = (FILE**)0x005711B4;
577	–	FILE *__fastcall DDrPrintWarning(int filename, int linenumber, unsigned __int16 errornum, int message)
578	–	{
579	–
580	–	FILE *v4; // eax@1
581	–	FILE *result; // eax@4
582	–	char v6[512]; // [sp+0h] [bp-100h]@1
583	–	FILE* UUgError_WarningFile = *_UUgError_WarningFile;
584	–
585	–	if (filename && message && (strlen((const char*)filename)+strlen((const char*)message))<420) {
586	–	sprintf(
587	–	v6,
588	–	"Error %x reported from File: %s, Line: %d (message follows) \r\n%s",
589	–	errornum,
590	–	(const char*)filename,
591	–	linenumber,
592	–	(const char*)message);
593	–
594	–	if ( UUgError_WarningFile
595	–	|| (UUgError_WarningFile = oni_fopen("debugger.txt", "wb"), UUgError_WarningFile ) )
596	–	{
597	–	oni_fprintf(UUgError_WarningFile, "%s\r\n", v6);
598	–	oni_fflush(UUgError_WarningFile);
599	–	}
600	–	}
601	–	//oni_fprintf(stdout, v6);
602	–	//sprintf(&v6, "%s", message);
603	–	*_UUgError_WarningFile = UUgError_WarningFile;
604	–	result = UUgError_WarningFile;
605	–	return result;
606	–	}
607	–
608	–	void __cdecl DDrMain(int argc, char* argv[])
609	–	{
610	–	int i;
611	–	char* section;
612	–	char* option;
613	–	bool falseoption;
614	–
615	–	DDrStartupMessage("daodan attached!");
616	–
617	–	// Tell Oni to not load non levelX_final-files by default:
618	–	opt_ignore_private_data = false;
619	–
620	–	// Enable sound by default:
621	–	opt_sound = true;
622	–
623	–	DDrConfig();
624	–	DDrStartupMessage("parsing command line...");
625	–	for (i = 1; i < argc; i ++)
626	–	{
627	–	if (argv[i][0] == '-')
628	–	{
629	–	section = argv[i] + 1;
630	–	if ((option = strchr(argv[i], '.')))
631	–	{
632	–	*option = '\0';
633	–	falseoption = (option[1] == 'n' || option[1] == 'N') && (option[2] = 'o' || option[2] == 'O');
634	–	if (i < (argc - 1) && argv[i + 1][0] != '-')
635	–	DDrIniCallback(section, true, option + 1, argv[++i]);
636	–	else
637	–	DDrIniCallback(section, true, option + (falseoption ? 3 : 1), (falseoption ? "false" : "true"));
638	–	*option = '.';
639	–	}
640	–	else
641	–	{
642	–	falseoption = (section[0] == 'n' || section[0] == 'N') && (section[1] = 'o' || section[1] == 'O');
643	–	ini_section = s_options;
644	–	if (i < (argc - 1) && argv[i + 1][0] != '-')
645	–	DDrIniCallback(NULL, false, section, argv[++i]);
646	–	else
647	–	DDrIniCallback(NULL, false, section + (falseoption ? 2 : 0), (falseoption ? "false" : "true"));
648	–	}
649	–	}
650	–	else
651	–	{
652	–	DDrStartupMessage("parse error \"%s\"", argv[i]);
653	–	break;
654	–	}
655	–	}
656	–	DDrStartupMessage("finished parsing");
657	–	DDrPatch_Init();
658	–
349		// Safe startup message printer
350		if (patch_safeprintf)
351		DDrPatch_MakeJump((void*)UUrStartupMessage, (void*)DDrStartupMessage);
352
353		// Daodan device mode enumeration function
354		if (patch_daodandisplayenum)
355	<	DDrPatch_MakeJump((void*)gl_enumerate_valid_display_modes, (void*)daodan_enumerate_valid_display_modes);
355	>	DDrPatch_MakeJump((void*)gl_enumerate_valid_display_modes, (void*)DD_GLrEnumerateDisplayModes);
356
357		// Performance patch
358		if (patch_usegettickcount)
#	Line 676 | Line 366 | void __cdecl DDrMain(int argc, char* arg
366		if (patch_cheatsenabled)
367		DDrPatch_MakeJump((void*)ONrPersist_GetWonGame, (void*)DDrPersist_GetWonGame);
368
369	<	// Windowed mode
369	>	// DaodanGL with windowed mode support.
370		if (patch_usedaodangl)
371		{
372	<	DDrPatch_NOOP((char*)(OniExe + 0x000032B7), 6);
373	<	DDrPatch_MakeCall((void*)(OniExe + 0x000032B7), (void*)LIiP_SetCursorPosHook);
374	<
375	<	DDrPatch_NOOP((char*)(OniExe + 0x00003349), 6);
376	<	DDrPatch_MakeCall((void*)(OniExe + 0x00003349), (void*)LIiP_SetCursorPosHook);
377	<	DDrPatch_MakeJump((void*)ONrPlatform_Initialize, (void*)DDrPlatform_Initialize);
378	<	DDrPatch_MakeJump((void*)gl_platform_initialize, (void*)daodangl_platform_initialize);
379	<	}
380	<	// Hacked windowed mode (for when daodangl isn't working properly)
381	<	else if (patch_windowhack)
382	<	DDrWindowHack_Install();
372	>	// LIrPlatform_Mode_Set: GetWindowRect -> GetClientRect.
373	>	DDrPatch_NOOP((char*) OniExe + 0x00002dd6, 6);
374	>	DDrPatch_MakeCall((char*) OniExe + 0x00002dd6, (void*) GetClientRect);
375	>
376	>	// UUrWindow_GetSize: GetWindowRect -> GetClientRect.
377	>	DDrPatch_NOOP((char*) OniExe + 0x0002651c, 6);
378	>	DDrPatch_MakeCall((char*) OniExe + 0x0002651c, (void*) GetClientRect);
379	>
380	>	// LIrPlatform_PollInputForAction: fix GetCursorPos call to return client coordinates.
381	>	DDrPatch_NOOP((char*) OniExe + 0x000032cc, 6);
382	>	DDrPatch_MakeCall((char*) OniExe + 0x000032cc, (void*) DD_GetCursorPos);
383	>
384	>	// LIrPlatform_InputEvent_GetMouse: fix GetCursorPos call to return client coordinates.
385	>	DDrPatch_NOOP((char*) OniExe + 0x00002cc2, 6);
386	>	DDrPatch_MakeCall((char*) OniExe + 0x00002cc2, (void*) DD_GetCursorPos);
387	>
388	>	// LIrPlatform_PollInputForAction: translate SetCursorPos position to screen coordinates.
389	>	DDrPatch_NOOP((char*) OniExe + 0x000032b7, 6);
390	>	DDrPatch_MakeCall((char*) OniExe + 0x000032b7, (void*) DD_SetCursorPos);
391	>
392	>	// LIrPlatform_PollInputForAction: translate SetCursorPos position to screen coordinates.
393	>	DDrPatch_NOOP((char*) OniExe + 0x00003349, 6);
394	>	DDrPatch_MakeCall((char*) OniExe + 0x00003349, (void*) DD_SetCursorPos);
395	>
396	>	// Replace ONrPlatformInitialize.
397	>	DDrPatch_MakeJump((void*) ONrPlatform_Initialize, (void*) DD_ONrPlatform_Initialize);
398	>
399	>	// Replace gl_platform_initialize.
400	>	DDrPatch_MakeJump((void*) gl_platform_initialize, (void*) DD_GLrPlatform_Initialize);
401	>
402	>	// Replace gl_platform_dispose.
403	>	DDrPatch_MakeJump((void *) gl_platform_dispose, (void*) DD_GLrPlatform_Dispose);
404	>	}
405	>
406	>	if (patch_clipcursor)
407	>	{
408	>	// LIrMode_Set: replace LIrPlatform_Mode_Set call with our hook.
409	>	DDrPatch_MakeCall((void*)(OniExe + 0x00003f9f), (void*) DD_LIrPlatform_Mode_Set);
410	>
411	>	// LIrMode_Set_Internal: replace LIrPlatform_Mode_Set call with our hook.
412	>	DDrPatch_MakeCall((void*)(OniExe + 0x00003fff), (void*) DD_LIrPlatform_Mode_Set);
413	>
414	>	// LIrTermiante: replace LIrPlatform_Terminate call with our hook.
415	>	DDrPatch_MakeCall((void*)(OniExe + 0x000004cb8), (void*) DD_LIrPlatform_Terminate);
416	>	}
417	>
418
419		if (patch_daodaninit)
420		DDrPatch_MakeCall((void*)(OniExe + 0x000d345a), (void*)DDrGame_Init);
#	Line 709 | Line 434 | void __cdecl DDrMain(int argc, char* arg
434		}
435
436		DDrPatch_MakeJump((void*)(OniExe + 0x000245A0), (void*)DDrPrintWarning);
437	+
438	+
439	+	return true;
440	+	}
441	+
442	+
443	+	void DDrException() {
444	+	int* i = 0;
445	+	*i = 1;
446	+	}
447	+
448	+	void __cdecl DDrMain(int argc, char* argv[])
449	+	{
450	+	DDrStartupMessage("Daodan: Daodan attached!");
451	+
452	+	// Tell Oni to not load non levelX_final-files by default:
453	+	opt_ignore_private_data = false;
454	+
455	+	// Enable sound by default:
456	+	opt_sound = true;
457	+
458	+	DDrConfig(argc, argv);
459	+
460	+	DDrPatch_Init();
461	+
462
463	<	ONiMain(argc, argv);
463	>	ONiMain(argc, argv);
464		}
465		/*
466		void DDrWrongExe()

Diff Legend

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