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 452 by rossy, Mon Aug 10 09:09:53 2009 UTC

#	Line 6 | Line 6
6		#include "Daodan_Win32.h"
7		#include "Daodan_Cheater.h"
8		#include "Daodan_Persistence.h"
9	+	#include "Daodan_BSL.h"
10
11		#include "Daodan_WindowHack.h"
12
#	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
42		bool patch_safeprintf = true;
43		bool patch_daodandisplayenum = true;
#	Line 43 | Line 45 | bool patch_usegettickcount = true;
45		bool patch_cheatsenabled = true;
46		bool patch_usedaodangl = false;
47		bool patch_windowhack = true;
48	+	bool patch_daodaninit = true;
49	+	bool patch_bsl = true;
50	+	bool patch_cheater = true;
51	+
52	+	bool opt_usedaodanbsl = true;
53
54		bool DDrPatch_Init()
55		{
#	Line 127 | Line 134 | bool DDrPatch_Init()
134		DDrPatch_Int16 (OniExe + 0x001b184, 0x9090);
135
136		// Multi-byte patch (multiple language support)
137	<	if (patch_multibyte)
137	>	if (!patch_multibyte)
138		{
139		DDrPatch_Byte  (OniExe + 0x0002d8f8, 0xeb);
140		DDrPatch_Byte  (OniExe + 0x0002d9ad, 0xeb);
#	Line 154 | Line 161 | bool DDrPatch_Init()
161		DDrPatch_Int32 (OniExe + 0x000f617a, (int)&DDr_CheatTable[0].message_on);
162		}
163
164	+	if (patch_argb8888)
165	+	{
166	+	DDrPatch_Byte  (OniExe + 0x00135af0, 0x07);
167	+	DDrPatch_Byte  (OniExe + 0x00135af4, 0x0B);
168	+	}
169	+
170		return true;
171		}
172
173	<	enum {s_unknown, s_patch, s_language} ini_section;
173	>	enum {s_unknown, s_options, s_patch, s_bsl, s_language} ini_section;
174
175		bool DDrIniCallback(char* section, bool newsection, char* name, char* value)
176		{
177		if (newsection)
178		{
179	<	if (!stricmp(section, "patch"))
179	>	if (!stricmp(section, "options"))
180	>	ini_section = s_options;
181	>	else if (!stricmp(section, "patch"))
182		ini_section = s_patch;
183	+	else if (!stricmp(section, "bsl"))
184	+	ini_section = s_bsl;
185		else if (!stricmp(section, "language"))
186		ini_section = s_language;
187		else
#	Line 176 | Line 193 | bool DDrIniCallback(char* section, bool
193
194		switch (ini_section)
195		{
196	+	case s_options:
197	+	if (!stricmp(name, "usedaodanbsl"))
198	+	opt_usedaodanbsl = !stricmp(inifile_cleanstr(value), "true");
199	+	break;
200		case s_patch:
201		if (!stricmp(name, "fonttexturecache"))
202	<	patch_fonttexturecache = !stricmp(value, "true");
202	>	patch_fonttexturecache = !stricmp(inifile_cleanstr(value), "true");
203		else if (!stricmp(name, "largetextures"))
204	<	patch_largetextures = !stricmp(value, "true");
204	>	patch_largetextures = !stricmp(inifile_cleanstr(value), "true");
205		else if (!stricmp(name, "levelplugins"))
206	<	patch_levelplugins = !stricmp(value, "true");
206	>	patch_levelplugins = !stricmp(inifile_cleanstr(value), "true");
207		else if (!stricmp(name, "pathfinding"))
208	<	patch_pathfinding = !stricmp(value, "true");
208	>	patch_pathfinding = !stricmp(inifile_cleanstr(value), "true");
209		else if (!stricmp(name, "projaware"))
210	<	patch_projaware = !stricmp(value, "true");
210	>	patch_projaware = !stricmp(inifile_cleanstr(value), "true");
211		else if (!stricmp(name, "directinput"))
212	<	patch_directinput = !stricmp(value, "true");
212	>	patch_directinput = !stricmp(inifile_cleanstr(value), "true");
213		else if (!stricmp(name, "wpfadetime"))
214	<	patch_wpfadetime = !stricmp(value, "true");
214	>	patch_wpfadetime = !stricmp(inifile_cleanstr(value), "true");
215		else if (!stricmp(name, "kickguns"))
216	<	patch_kickguns = !stricmp(value, "true");
216	>	patch_kickguns = !stricmp(inifile_cleanstr(value), "true");
217		else if (!stricmp(name, "cooldowntimer"))
218	<	patch_cooldowntimer = !stricmp(value, "true");
218	>	patch_cooldowntimer = !stricmp(inifile_cleanstr(value), "true");
219		else if (!stricmp(name, "throwtest"))
220	<	patch_throwtest = !stricmp(value, "true");
220	>	patch_throwtest = !stricmp(inifile_cleanstr(value), "true");
221		else if (!stricmp(name, "alttab"))
222	<	patch_alttab = !stricmp(value, "true");
222	>	patch_alttab = !stricmp(inifile_cleanstr(value), "true");
223		else if (!stricmp(name, "particledisablebit"))
224	<	patch_particledisablebit = !stricmp(value, "true");
224	>	patch_particledisablebit = !stricmp(inifile_cleanstr(value), "true");
225		else if (!stricmp(name, "multibyte"))
226	<	patch_multibyte = !stricmp(value, "true");
226	>	patch_multibyte = !stricmp(inifile_cleanstr(value), "true");
227		else if (!stricmp(name, "cheattable"))
228	<	patch_cheattable = !stricmp(value, "true");
228	>	patch_cheattable = !stricmp(inifile_cleanstr(value), "true");
229	>	else if (!stricmp(name, "argb8888"))
230	>	patch_argb8888 = !stricmp(inifile_cleanstr(value), "true");
231		else if (!stricmp(name, "safeprintf"))
232	<	patch_safeprintf = !stricmp(value, "true");
232	>	patch_safeprintf = !stricmp(inifile_cleanstr(value), "true");
233		else if (!stricmp(name, "daodandisplayenum"))
234	<	patch_daodandisplayenum = !stricmp(value, "true");
234	>	patch_daodandisplayenum = !stricmp(inifile_cleanstr(value), "true");
235		else if (!stricmp(name, "usegettickcount"))
236	<	patch_usegettickcount = !stricmp(value, "true");
236	>	patch_usegettickcount = !stricmp(inifile_cleanstr(value), "true");
237		else if (!stricmp(name, "cheatsenabled"))
238	<	patch_cheatsenabled = !stricmp(value, "true");
238	>	patch_cheatsenabled = !stricmp(inifile_cleanstr(value), "true");
239		else if (!stricmp(name, "usedaodangl"))
240	<	patch_usedaodangl = !stricmp(value, "true");
240	>	patch_usedaodangl = !stricmp(inifile_cleanstr(value), "true");
241		else if (!stricmp(name, "windowhack"))
242	<	patch_windowhack = !stricmp(value, "true");
242	>	patch_windowhack = !stricmp(inifile_cleanstr(value), "true");
243	>	else if (!stricmp(name, "daodaninit"))
244	>	patch_daodaninit = !stricmp(inifile_cleanstr(value), "true");
245	>	else if (!stricmp(name, "bsl"))
246	>	patch_bsl = !stricmp(inifile_cleanstr(value), "true");
247	>	else if (!stricmp(name, "cheater"))
248	>	patch_cheater = !stricmp(inifile_cleanstr(value), "true");
249		else
250		DDrStartupMessage("unrecognised patch \"%s\"", name);
251		break;
#	Line 279 | Line 308 | bool DDrIniCallback(char* section, bool
308		{
309		char* str = strdup(value);
310		DDr_CheatTable[11].message_on = str;
311	<	DDr_CheatTable[cheat_devmodex].message_on = str;
311	>	DDr_CheatTable[cheat_x].message_on = str;
312		}
313		else if (!stricmp(name, "devmode_off"))
314		{
315		char* str = strdup(value);
316		DDr_CheatTable[11].message_off = str;
317	<	DDr_CheatTable[cheat_devmodex].message_off = str;
317	>	DDr_CheatTable[cheat_x].message_off = str;
318		}
319		else if (!stricmp(name, "reservoirdogs_on"))
320		DDr_CheatTable[12].message_on = strdup(value);
#	Line 328 | Line 357 | bool DDrIniCallback(char* section, bool
357		else
358		DDrStartupMessage("unrecognised language item \"%s\"", name);
359		break;
360	+	case s_bsl:
361		default:
362		break;
363		}
#	Line 354 | Line 384 | void DDrConfig()
384		DDrStartupMessage("finished parsing");
385		}
386
387	+	void ONICALL DDrGame_Init()
388	+	{
389	+	if (opt_usedaodanbsl)
390	+	SLrDaodan_Initalize();
391	+	}
392	+
393		void __cdecl DDrMain(int argc, char* argv[])
394		{
395		DDrStartupMessage("daodan attached!");
#	Line 391 | Line 427 | void __cdecl DDrMain(int argc, char* arg
427		if (patch_windowhack)
428		DDrWindowHack_Install();
429
430	+	if (patch_daodaninit)
431	+	DDrPatch_MakeCall(OniExe + 0x000d345a, DDrGame_Init);
432	+
433	+	// Patches for existing BSL functions
434	+	if (patch_bsl)
435	+	SLrDaodan_Patch();
436	+
437	+	if (patch_cheater)
438	+	DDrPatch_MakeCall(OniExe + 0x000f618f, DDrCheater);
439	+
440		init_daodan_gl();
441
442		ONiMain(argc, argv);

Diff Legend

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