ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/Daodan/src/Patches/Patches.c
(Generate patch)

Comparing Daodan/src/Patches/Patches.c (file contents):
Revision 994 by alloc, Mon Apr 7 10:33:27 2014 UTC vs.
Revision 1008 by alloc, Mon Aug 25 23:21:09 2014 UTC

# Line 17 | Line 17 | typedef int (__cdecl *CHINESEPROC)(DWORD
17   // slider in windowed mode.
18   static void ONICALL DD_ONiOGU_GammaSlider_SetRange(void* window, int min_value, int max_value)
19   {
20 <        ConfigOption_t* co = DDrConfig_GetOptOfType("options.gamma", C_BOOL);
20 >        ConfigOption_t* co = DDrConfig_GetOptOfType("graphics.gamma", C_BOOL);
21          WMrWindow_SetEnabled(window, M3gResolutionSwitch && co->value.intBoolVal);
22          WMrSlider_SetRange(window, min_value, max_value);
23   }
# Line 84 | Line 84 | void ONICALL DDrShowOptionsButton(void*
84  
85   void ONICALL DDrGame_Init()
86   {
87 <        ConfigOption_t* co = DDrConfig_GetOptOfType("options.usedaodanbsl", C_BOOL);
88 <        if (co->value.intBoolVal)
87 >        if (DDrConfig_GetOptOfType("modding.daodanbsl", C_BOOL)->value.intBoolVal)
88                  SLrDaodan_Initialize();
89   }
90  
# Line 192 | Line 191 | void ONICALL DD_ONrGameState_HandleUtili
191   }
192  
193  
194 < int DD_Patch_DebugNameTextureInit(short width, short height, int type, int allocated, int flags, char* name, void** output)
195 < {
197 <        //flags = (1 << 10);
198 <        type = 1;
199 <        //DDrPatch_Byte( 0x005EB83C + 3, 0xff );
200 <        DDrPatch_Int32((int*)(OniExe + 0x001EB83C), 0xFF000000 );
201 <        return M3rTextureMap_New(width, height, type, allocated, flags, name, output);
202 < }
203 <
204 < short DD_Patch_DebugNameShadeHack( Character* Char )
205 < {
206 <        return TSrContext_SetShade(*(void**)(OniExe + 0x001EB844), ONrCharacter_GetHealthShade( Char->Health, Char->MaxHealth ));
207 <        //return TSrContext_SetShade(*(void**)0x005EB844, 0xFFFFFFFF);
208 < }
209 <
210 <
211 < // Disable UUrPlatform_Initalize/Terminate, this enables the Alt-Tab and the
212 < // Windows key but has the possible side effect of allowing the screensaver
213 < // to enable itself in-game.
214 < void DD_Patch_AltTab()
215 < {
216 <        // 0xC3 = ret, so makes those functions just have a "ret" instruction at their start
217 <        DDrPatch_Byte  ((char*)UUrPlatform_Initialize, 0xC3);
218 <        DDrPatch_Byte  ((char*)UUrPlatform_Terminate, 0xC3);
219 < }
220 <
221 < // Textures using ARGB8888 can be used
222 < void DD_Patch_ARGB8888()
223 < {
224 <        DDrPatch_Byte  ((char*)(OniExe + 0x00135af0), 0x07);
225 <        DDrPatch_Byte  ((char*)(OniExe + 0x00135af4), 0x0B);
226 < }
227 <
228 < // Fix BinkBufferInit() call in BKrMovie_Play() to use GDI (DIB) blitting
229 < // instead of DirectDraw; patch ONiRunGame to use the same method to play
230 < // outro (ie., BKrMovie_Play() instead of ONrMovie_Play_Hardware() as the
231 < // latter has problems on WINE).
232 < void DD_Patch_BinkPlay()
194 > // Enables d_regen script command. Instead of one global flag to only regenerate player each char has a flag to enable local regeneration
195 > void DD_Patch_Regeneration()
196   {
197 <        // push BINKBUFFERAUTO -> push BINKBUFFERDIBSECTION.
235 <        DDrPatch_Byte((void*)(OniExe + 0x0008829b + 1), 0x02);
236 <        // call ONrMovie_Play_Hardware -> call ONrMovie_Play
237 <        DDrPatch_MakeCall((void*)(OniExe + 0x000d496f), ONrMovie_Play);
238 < }
239 <
240 < // Enables d_regen (unfinished) and prevents fly-in portraits from being
241 < // stretched when playing in widescreen resolutions.
242 < void DD_Patch_BSL()
243 < {
244 <        //Calculating the value of the needed offset is much more reliable when the compiler does it for you.
245 <
246 <        //TODO: fix moonshadow.
197 >        // In: WPrInventory_Update
198          Character * Chr = 0;
199          int NoPath = (int)&(Chr[0].RegenHax) & 0x000000FF;
200          const unsigned char regen_patch[] =
201          {0x90, 0x90, 0x90, 0x90, 0x90,                          // mov    al, _WPgRegenerationCheat     -> NOOP
202 <        0x90, 0x90,                                                                     // test   al, al                                        -> NOOP
203 <        0x90, 0x90,                                                                     // jz     short loc_51BB98                      -> NOOP
202 >        0x90, 0x90,                                             // test   al, al                        -> NOOP
203 >        0x90, 0x90,                                             // jz     short loc_51BB98                      -> NOOP
204          0x8B, 0x86, (char)NoPath, 0x01, 0x00, 0x00, // mov     eax, [esi+Character.field_1E8]
205 <                                                                                                //      -> mov     eax, [esi+Character.RegenHax]
206 <        0x85, 0xC0,                                                                     // test eax, eax
207 <        0x74, 0x21                                                                      // jnz 0x21 -> jz 0x21
208 <        };      
205 >                                                        //      -> mov     eax, [esi+Character.RegenHax]
206 >        0x85, 0xC0,                                             // test eax, eax
207 >        0x74, 0x21                                              // jnz 0x21 -> jz 0x21
208 >        };
209          DDrPatch_Const((char*)(OniExe + 0x0011BB64), regen_patch);
259
260        // Patches for existing BSL functions
261        SLrDaodan_Patch();
262 }
263
264 // Adds new cheat codes if cheattable is also enabled
265 void DD_Patch_Cheater()
266 {
267        DDrPatch_MakeCall((void*)(OniExe + 0x000f618f), (void*)DDrCheater);
268        DDrPatch_Int16((short*)(OniExe + 0x000deb45), 0x5590);
269 #if 1
270        DDrPatch_MakeCall((void*)(OniExe + 0x000deb47), (void*)FallingFrames);
271 #endif
272        DDrPatch_MakeJump((void*)(OniExe + 0x0010f021), (void*)DDrCheater_LevelLoad);
210   }
211  
275 // Cheats always enabled
276 void DD_Patch_CheatsEnabled()
277 {
278        DDrPatch_MakeJump((void*)ONrPersist_GetWonGame, (void*)DDrPersist_GetWonGame);
279 }
280
281 // Use Daodan's own cheattable
282 void DD_Patch_CheatTable()
283 {
284        DDrPatch_Int32 ((int*)(OniExe + 0x000f616b), (int)&DDr_CheatTable[0].name);
285        DDrPatch_Int32 ((int*)(OniExe + 0x000f617a), (int)&DDr_CheatTable[0].message_on);
286 }
212  
213   // Load chinese font DLL if available
214   void DD_Patch_Chinese()
# Line 311 | Line 236 | void DD_Patch_Chinese()
236          }
237   }
238  
314 // Limit cursor to Oni's window
315 void DD_Patch_ClipCursor()
316 {
317        // LIrMode_Set: replace LIrPlatform_Mode_Set call with our hook.
318        DDrPatch_MakeCall((void*)(OniExe + 0x00003f9f), (void*) DD_LIrPlatform_Mode_Set);
319
320        // LIrMode_Set_Internal: replace LIrPlatform_Mode_Set call with our hook.
321        DDrPatch_MakeCall((void*)(OniExe + 0x00003fff), (void*) DD_LIrPlatform_Mode_Set);
322        
323        // LIrTermiante: replace LIrPlatform_Terminate call with our hook.
324        DDrPatch_MakeCall((void*)(OniExe + 0x000004cb8), (void*) DD_LIrPlatform_Terminate);
325 }
326
327 // Disables weapon cooldown exploit
328 void DD_Patch_CooldownTimer()
329 {
330        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 };
331        DDrPatch_Const ((char*)(OniExe + 0x0011a825), cooldown_patch);
332 }
333
334 // Daodan device mode enumeration function
335 void DD_Patch_DaodanDisplayEnum()
336 {
337        DDrPatch_MakeJump((void*)gl_enumerate_valid_display_modes, (void*)DD_GLrEnumerateDisplayModes);
338 }
339
340 // Adds new BSL functions
341 void DD_Patch_DaodanInit()
342 {
343        DDrPatch_MakeCall((void*)(OniExe + 0x000d345a), (void*)DDrGame_Init);
344 }
345
346 // Forced DirectInput (for Windows NT)
347 void DD_Patch_DirectInput()
348 {
349        DDrPatch_Byte((char*)(OniExe + 0x00002e6d), 0xeb);
350 }
351
352 // Disable Oni's command line parser so it doesn't interfere with ours
353 void DD_Patch_DisableCmdLine()
354 {
355        // Replace start of OniParseCommandLine with XOR ax,ax; RET
356 //      DDrPatch_Int32 ((int*)(OniExe + 0x000d3570), 0xc3c03366);
357        // Replace start of OniParseCommandLine with XOR eax,eax; RET
358        DDrPatch_Int32 ((int*)(OniExe + 0x000d3570), 0x00c3c033);
359 }
360
361 // Font texture cache doubled
362 void DD_Patch_FontTextureCache()
363 {
364        DDrPatch_Byte((char*)(OniExe + 0x00020ea7), 0x20);
365        DDrPatch_Byte((char*)(OniExe + 0x00020f4a), 0x40);
366 }
367
368 // Disable Oni's internal CLrGetCommandLine function (to eventually replace it with our own)
369 void DD_Patch_GetCmdLine()
370 {
371        DDrPatch_NOOP  ((char*)(OniExe + 0x000d3280), 51);
372 }
373
374 // Allow HD screens with resolution < 1024*768
375 void DD_Patch_HDScreens_LowRes()
376 {
377        DDrPatch_MakeJump((void*)M3rDraw_BigBitmap, (void*)DD_M3rDraw_BigBitmap);
378 }
379
380 void DD_Patch_HighresConsole() {
381        Oni_COrTextArea_Resize = DDrPatch_MakeDetour((void*)COrTextArea_Resize, (void*)DD_COrTextArea_Resize);
382 }
383
384 // Hackish fix for Konoko not kicking guns
385 // Don't use this, it breaks stairs.
386 void DD_Patch_KickGuns()
387 {
388        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 };
389        DDrPatch_Const ((char*)(OniExe + 0x000dc420), kickgun_patch);
390 }
391
392 // Disable loading the vtuneapi.dll
393 void DD_Patch_KillVTune()
394 {
395        DDrPatch_Byte  ((char*)(OniExe + 0x00026340), 0xC3);
396 }
397
398 // Now supports textures up to 512x512
399 void DD_Patch_LargeTextures()
400 {
401        DDrPatch_Byte  ((char*)(OniExe + 0x00005251), 0x10);
402 }
403
404 // Non-"_Final" levels are now valid
405 void DD_Patch_LevelPlugins()
406 {
407        DDrPatch_Byte  ((char*)(OniExe + 0x000206a8), 0x01);
408 }
409
410 // Weapon on ground shown with name and magazine contents
411 void DD_Patch_NewWeap()
412 {
413        //Makes it always say "Received weapon_name."
414        //Needs check for loc_4DFC66
415        //DDrPatch_NOOP((char*)(OniExe + 0x000E4DF8),2);
416
417        //Adds Weapon name and ammo meter to pickup autoprompt
418        DDrPatch_NOOP((char*)(OniExe + 0x000FAC73), 9);
419        DDrPatch_NOOP((char*)(OniExe + 0x000FAC80), 5);
420        DDrPatch_MakeCall((void*)(OniExe + 0xFAC85), (void*)DDrWeapon2Message);
421        
422        //Moves location of colors
423        //DDrPatch_Int32((int*)(OniExe + 0x0002E3D5), (int)&DDrDSayColors );
424        //DDrPatch_Int32((int*)(OniExe + 0x0002E3DA), (int)&DDrDSayColors );
425 }
426
427 // Disable Multi-byte character awareness patch (multiple language support)
428 void DD_Patch_NoMultiByte()
429 {
430        DDrPatch_Byte  ((char*)(OniExe + 0x0002d8f8), 0xeb);
431        DDrPatch_Byte  ((char*)(OniExe + 0x0002d9ad), 0xeb);
432        DDrPatch_Byte  ((char*)(OniExe + 0x0002dbe2), 0xeb);
433        DDrPatch_Byte  ((char*)(OniExe + 0x0002dec3), 0xeb);
434        DDrPatch_Byte  ((char*)(OniExe + 0x0002e2ab), 0xeb);
435        DDrPatch_Byte  ((char*)(OniExe + 0x0002e2c4), 0xeb);
436        DDrPatch_Byte  ((char*)(OniExe + 0x0002e379), 0xeb);
437        DDrPatch_Byte  ((char*)(OniExe + 0x0002e48c), 0xeb);
438        DDrPatch_Byte  ((char*)(OniExe + 0x0002e4d0), 0xeb);
439        DDrPatch_Byte  ((char*)(OniExe + 0x0002e4f4), 0xeb);
440        DDrPatch_Byte  ((char*)(OniExe + 0x0002e646), 0xeb);
441        DDrPatch_Byte  ((char*)(OniExe + 0x0002e695), 0xeb);
442        DDrPatch_Byte  ((char*)(OniExe + 0x0002e944), 0xeb);
443        DDrPatch_Byte  ((char*)(OniExe + 0x0002e95d), 0xeb);
444        DDrPatch_Byte  ((char*)(OniExe + 0x0002e98e), 0xeb);
445        DDrPatch_Byte  ((char*)(OniExe + 0x0002e9dc), 0xeb);
446 }
447
448 // Fix options not visible in main menu when a game was started
449 void DD_Patch_OptionsVisible()
450 {
451        DDrPatch_MakeCall((void*)(OniExe + 0x000d2d2d), DDrShowOptionsButton);
452        DDrPatch_MakeCall((void*)(OniExe + 0x000d2d43), DDrShowResumeButton);
453 }
454
455 // Unlocks particle action disabling/enabling bits for all events. (Will be
456 // controlled by a command line switch when I figure out how to do that without
457 // Win32 hacks.)
458 void DD_Patch_ParticleDisableBit()
459 {
460        DDrPatch_Int16 ((short*)(OniExe + 0x001b184), 0x9090);
461 }
462
463 // Pathfinding grid cache size x8
464 void DD_Patch_PathFinding()
465 {
466        const unsigned char pathfinding[2] = {0x90 , 0xE9 };
467        DDrPatch_Byte  ((char*)(OniExe + 0x0010b03b), 0x20);
468        DDrPatch_Byte  ((char*)(OniExe + 0x0010b04c), 0x20);
469
470        //other stuff
471        DDrPatch_Const((char*)(OniExe + 0x00040789), pathfinding);
472 }
473
474 // Projectile awareness fixed
475 void DD_Patch_ProjAware()
476 {
477        DDrPatch_Byte  ((char*)(OniExe + 0x0009c07c), 0x6c);
478        DDrPatch_Byte  ((char*)(OniExe + 0x0009c080), 0x70);
479        DDrPatch_Byte  ((char*)(OniExe + 0x0009c084), 0x74);
480        DDrPatch_Byte  ((char*)(OniExe + 0x0009c110), 0x6c);
481 }
482
483 // Safe startup message printer
484 void DD_Patch_SafePrintf()
485 {
486        DDrPatch_MakeJump((void*)UUrStartupMessage, (void*)DDrStartupMessage);
487 }
488
489 // Show all (also enemies') lasersights
490 void DD_Patch_ShowAllLasersights()
491 {
492        DDrPatch_NOOP((char*)(OniExe + 0x000E1957), 6 );
493 }
494
495 void DD_Patch_ShowTriggerVolumes()
496 {
497        Oni_ONrMechanics_Register = DDrPatch_MakeDetour((void*)ONrMechanics_Register, (void*)DD_ONrMechanics_Register);
498        Oni_ONrGameState_HandleUtilityInput = DDrPatch_MakeDetour((void*)ONrGameState_HandleUtilityInput, (void*)DD_ONrGameState_HandleUtilityInput);
499 }
500
501 // Experiment with allowing enemies to be thrown over railings
502 void DD_Patch_Throwtest()
503 {
504        const unsigned char throwtest_patch[] = { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 };
505        DDrPatch_Const((char*)(OniExe + 0x000dc190), throwtest_patch);
506 }
507
508 // DaodanGL with windowed mode support
509 void DD_Patch_UseDaodanGL()
510 {
511        // LIrPlatform_Mode_Set: GetWindowRect -> GetClientRect.
512        DDrPatch_NOOP((char*) OniExe + 0x00002dd6, 6);
513        DDrPatch_MakeCall((char*) OniExe + 0x00002dd6, (void*) GetClientRect);
239  
515        // UUrWindow_GetSize: GetWindowRect -> GetClientRect.
516        DDrPatch_NOOP((char*) OniExe + 0x0002651c, 6);
517        DDrPatch_MakeCall((char*) OniExe + 0x0002651c, (void*) GetClientRect);
240  
241 <        // LIrPlatform_PollInputForAction: fix GetCursorPos call to return client coordinates.
520 <        DDrPatch_NOOP((char*) OniExe + 0x000032cc, 6);
521 <        DDrPatch_MakeCall((char*) OniExe + 0x000032cc, (void*) DD_GetCursorPos);
522 <
523 <        // LIrPlatform_InputEvent_GetMouse: fix GetCursorPos call to return client coordinates.
524 <        DDrPatch_NOOP((char*) OniExe + 0x00002cc2, 6);
525 <        DDrPatch_MakeCall((char*) OniExe + 0x00002cc2, (void*) DD_GetCursorPos);
526 <
527 <        // LIrPlatform_PollInputForAction: translate SetCursorPos position to screen coordinates.
528 <        DDrPatch_NOOP((char*) OniExe + 0x000032b7, 6);
529 <        DDrPatch_MakeCall((char*) OniExe + 0x000032b7, (void*) DD_SetCursorPos);
530 <
531 <        // LIrPlatform_PollInputForAction: translate SetCursorPos position to screen coordinates.
532 <        DDrPatch_NOOP((char*) OniExe + 0x00003349, 6);
533 <        DDrPatch_MakeCall((char*) OniExe + 0x00003349, (void*) DD_SetCursorPos);
534 <
535 <        // Replace ONrPlatformInitialize.
536 <        DDrPatch_MakeJump((void*) ONrPlatform_Initialize, (void*) DD_ONrPlatform_Initialize);
537 <
538 <        // Replace gl_platform_initialize.
539 <        DDrPatch_MakeJump((void*) gl_platform_initialize, (void*) DD_GLrPlatform_Initialize);
540 <
541 <        // Replace gl_platform_dispose.
542 <        DDrPatch_MakeJump((void *) gl_platform_dispose, (void*) DD_GLrPlatform_Dispose);
543 < }
544 <
545 < // Performance patch
546 < void DD_Patch_UseGetTickCount()
547 < {
548 <        DDrPatch_MakeJump((void*)UUrMachineTime_High, (void*)DDrMachineTime_High);
549 <        DDrPatch_MakeJump((void*)UUrMachineTime_High_Frequency, (void*)DDrMachineTime_High_Frequency);
550 <        DDrPatch_MakeJump((void*)UUrMachineTime_Sixtieths, (void*)DDrMachineTime_Sixtieths);
551 < }
552 <
553 < // Adds working function for existing BSL command wp_fadetime, sets fade time to 4800
554 < void DD_Patch_WpFadetime()
555 < {
556 <        // Makes wp_fadetime actually have a function
557 <        const unsigned char fadetime_patch[] = { 0x66, 0x8B, 0x1D, 0xC4, 0x7D, 0x62, 0x00, 0x66, 0x89, 0x5E, 0x46, 0x5B, 0x5E, 0x83, 0xC4, 0x14, 0xC3 };
558 <        DDrPatch_Const ((char*)(OniExe + 0x0011a889), fadetime_patch);
559 <        DDrPatch_Byte  ((char*)(OniExe + 0x0011a560), 0x31);
560 <        
561 <        // Sets the fadetime to 4800 by default
562 <        DDrPatch_Int16 ((short*)(OniExe + 0x0011ab0e), 0x12c0);
563 < }
564 <
565 < // Disable gamma slider in options in windowed mode
566 < void DD_Patch_GammaSlider()
241 > int DD_Patch_DebugNameTextureInit(short width, short height, int type, int allocated, int flags, char* name, void** output)
242   {
243 <        DDrPatch_MakeCall((void*)(OniExe + 0x000d262c), (void*)DD_ONiOGU_GammaSlider_SetRange);
243 >        //flags = (1 << 10);
244 >        type = 1;
245 >        //DDrPatch_Byte( 0x005EB83C + 3, 0xff );
246 >        DDrPatch_Int32((int*)(OniExe + 0x001EB83C), 0xFF000000 );
247 >        return M3rTextureMap_New(width, height, type, allocated, flags, name, output);
248   }
249  
250 < // Fix the warning print method
572 < void DD_Patch_PrintWarning()
250 > short DD_Patch_DebugNameShadeHack( Character* Char )
251   {
252 <        DDrPatch_MakeJump((void*)(OniExe + 0x000245A0), (void*)DDrPrintWarning);
252 >        return TSrContext_SetShade(*(void**)(OniExe + 0x001EB844), ONrCharacter_GetHealthShade( Char->Health, Char->MaxHealth ));
253   }
254  
255   //Fix crappy ai2_shownames
# Line 598 | Line 276 | void DD_Patch_ShowNames()
276   */
277   }
278  
601 /*
602 void DD_Patch_ShowTriggerVolumes()
603 {
604        DDrPatch_Int32((int*)(OniExe + 0x000cc9bb+4), (uint32_t)DD_OBJiTriggerVolume_Draw);
605 }
279  
280 < void DD_Patch_ShowFlags()
280 > void DD_Patch_CharacterAwareness()
281   {
282 <        DDrPatch_Int32((int*)(OniExe + 0x000c4ed4+4), (uint32_t)DD_OBJiFlag_Draw);
282 >        const unsigned char patch[] =
283 >        {
284 >                0x52,                           //  0: push   edx
285 >                0xBA, 0xA0, 0x16, 0x00, 0x00,   //  1: mov    edx,0x16a0
286 >                0x89, 0xF8,                     //  6: mov    eax,edi
287 >                0xF7, 0xE2,                     //  8: mul    edx
288 >                0x89, 0xC2,                     //  a: mov    edx,eax
289 >                0xE8, 0x00, 0x00, 0x00, 0x00,   //  c: call   ONrGameState_LivingCharacterList_Get (-> OniExe + 0x000fca90)
290 >                0x8B, 0x00,                     // 11: mov    eax,[eax]
291 >                0x01, 0xD0,                     // 13: add    eax,edx
292 >                0x89, 0xC6,                     // 15: mov    esi,eax
293 >                0x5A,                           // 17: pop    edx
294 >                0x8B, 0x46, 0x04,               // 18: (ORIG) mov        eax, dword [ds:esi+0x4]
295 >                0xF6, 0xC4, 0x80                // 1b: (ORIG) test       ah, 0x80
296 >        };
297 >        void* newCode = DDrPatch_ExecutableASM((char*)(OniExe + 0x0009A609), (char*)(OniExe + 0x0009A60F), patch, sizeof(patch));
298 >        if ((int)newCode > 0) {
299 >                DDrPatch_MakeCall((char*)(newCode+0xC), (char*)(OniExe + 0x000FCA90));
300 >                DDrPatch_NOOP((char*)(OniExe + 0x0009A60E), 1);
301 >        }
302   }
303 < */
303 >
304 >
305 >
306 >
307 >
308  
309   bool DD_Patch_Init()
310   {
311          STARTUPMESSAGE("Patching engine", 0);
312          
313 <        if (DDrConfig_GetOptOfType("patches.alttab", C_BOOL)->value.intBoolVal)
314 <                DD_Patch_AltTab();
313 >        // Disable UUrPlatform_Initalize/Terminate, this enables the Alt-Tab and the
314 >        // Windows key but has the possible side effect of allowing the screensaver
315 >        // to enable itself in-game.
316 >        if (DDrConfig_GetOptOfType("windows.alttab", C_BOOL)->value.intBoolVal)
317 >        {
318 >                // 0xC3 = ret, so makes those functions just have a "ret" instruction at their start
319 >                DDrPatch_Byte((char*)UUrPlatform_Initialize, 0xC3);
320 >                DDrPatch_Byte((char*)UUrPlatform_Terminate, 0xC3);
321 >        }
322          
323 <        if (DDrConfig_GetOptOfType("patches.argb8888", C_BOOL)->value.intBoolVal)
324 <                DD_Patch_ARGB8888();
323 >        // Textures using ARGB8888 can be used
324 >        if (DDrConfig_GetOptOfType("modding.argb8888", C_BOOL)->value.intBoolVal)
325 >        {
326 >                // Update conversion lookups in IMgConvertPixelType_List
327 >                DDrPatch_Byte((char*)(OniExe + 0x00135af0), 0x07);
328 >                DDrPatch_Byte((char*)(OniExe + 0x00135af4), 0x0B);
329 >        }
330 >
331 >        // Fix BinkBufferInit() call in BKrMovie_Play() to use GDI (DIB) blitting
332 >        // instead of DirectDraw; patch ONiRunGame to use the same method to play
333 >        // outro (ie., BKrMovie_Play() instead of ONrMovie_Play_Hardware() as the
334 >        // latter has problems on WINE).
335 >        if (DDrConfig_GetOptOfType("graphics.binkplay", C_BOOL)->value.intBoolVal)
336 >        {
337 >                // push BINKBUFFERAUTO -> push BINKBUFFERDIBSECTION.
338 >                DDrPatch_Byte((void*)(OniExe + 0x0008829b + 1), 0x02);
339 >                // call ONrMovie_Play_Hardware -> call ONrMovie_Play
340 >                DDrPatch_MakeCall((void*)(OniExe + 0x000d496f), ONrMovie_Play);
341 >        }
342  
343 <        if (DDrConfig_GetOptOfType("patches.binkplay", C_BOOL)->value.intBoolVal)
344 <                DD_Patch_BinkPlay();
343 >        if (DDrConfig_GetOptOfType("modding.d_regen", C_BOOL)->value.intBoolVal)
344 >                DD_Patch_Regeneration();
345  
346 <        if (DDrConfig_GetOptOfType("patches.bsl", C_BOOL)->value.intBoolVal)
347 <                DD_Patch_BSL();
346 >        if (DDrConfig_GetOptOfType("gameplay.characterawareness", C_BOOL)->value.intBoolVal)
347 >                DD_Patch_CharacterAwareness();
348  
349 <        if (DDrConfig_GetOptOfType("patches.cheater", C_BOOL)->value.intBoolVal)
350 <                DD_Patch_Cheater();
349 >        // Cheats always enabled
350 >        if (DDrConfig_GetOptOfType("gameplay.cheatsenabled", C_BOOL)->value.intBoolVal)
351 >        {
352 >                DDrPatch_MakeJump((void*)ONrPersist_GetWonGame, (void*)DDrPersist_GetWonGame);
353 >        }
354  
355 <        if (DDrConfig_GetOptOfType("patches.cheatsenabled", C_BOOL)->value.intBoolVal)
356 <                DD_Patch_CheatsEnabled();
355 >        // Use Daodan's own cheattable
356 >        if (DDrConfig_GetOptOfType("gameplay.cheattable", C_BOOL)->value.intBoolVal)
357 >        {
358 >                // In ONrGameState_HandleCheats: Replace pointers to orig cheattable
359 >                DDrPatch_Int32 ((int*)(OniExe + 0x000f616b), (int)&DDr_CheatTable[0].name);
360 >                DDrPatch_Int32 ((int*)(OniExe + 0x000f617a), (int)&DDr_CheatTable[0].message_on);
361 >
362 >                // ONrGameState_HandleCheats: Replace call to ONrCheater
363 >                DDrPatch_MakeCall((void*)(OniExe + 0x000f618f), (void*)DDrCheater);
364 >
365 >                // In: ONrGameState_DoCharacterFrame
366 >                //  -> NOP; PUSH ebp; CALL FallingFrames
367 >                // Replace fall height frame counter (actually in-air frame counter) increase by a
368 >                //  conditional one (only counted when inc_fallingframes)
369 >                DDrPatch_Int16((short*)(OniExe + 0x000deb45), 0x5590);
370 >                DDrPatch_MakeCall((void*)(OniExe + 0x000deb47), (void*)FallingFrames);
371  
372 <        if (DDrConfig_GetOptOfType("patches.cheattable", C_BOOL)->value.intBoolVal)
373 <                DD_Patch_CheatTable();
372 >                // At end of ONrUnlockLevel to init values on level loading
373 >                DDrPatch_MakeJump((void*)(OniExe + 0x0010f021), (void*)DDrCheater_LevelLoad);
374 >        }
375          
376 <        if (DDrConfig_GetOptOfType("patches.chinese", C_BOOL)->value.intBoolVal)
376 >        if (DDrConfig_GetOptOfType("language.chinese", C_BOOL)->value.intBoolVal)
377                  DD_Patch_Chinese();
378  
379 <        if (DDrConfig_GetOptOfType("patches.clipcursor", C_BOOL)->value.intBoolVal)
380 <                DD_Patch_ClipCursor();
381 <
382 <        if (DDrConfig_GetOptOfType("patches.cooldowntimer", C_BOOL)->value.intBoolVal)
383 <                DD_Patch_CooldownTimer();
379 >        // Limit cursor to Oni's window
380 >        if (DDrConfig_GetOptOfType("windows.clipcursor", C_BOOL)->value.intBoolVal)
381 >        {
382 >                // LIrMode_Set: replace LIrPlatform_Mode_Set call with our hook.
383 >                DDrPatch_MakeCall((void*)(OniExe + 0x00003f9f), (void*) DD_LIrPlatform_Mode_Set);
384  
385 <        if (DDrConfig_GetOptOfType("patches.daodandisplayenum", C_BOOL)->value.intBoolVal)
386 <                DD_Patch_DaodanDisplayEnum();
385 >                // LIrMode_Set_Internal: replace LIrPlatform_Mode_Set call with our hook.
386 >                DDrPatch_MakeCall((void*)(OniExe + 0x00003fff), (void*) DD_LIrPlatform_Mode_Set);
387          
388 <        if (DDrConfig_GetOptOfType("patches.directinput", C_BOOL)->value.intBoolVal)
389 <                DD_Patch_DirectInput();
388 >                // LIrTerminate: replace LIrPlatform_Terminate call with our hook.
389 >                DDrPatch_MakeCall((void*)(OniExe + 0x000004cb8), (void*) DD_LIrPlatform_Terminate);
390 >        }
391  
392 <        if (DDrConfig_GetOptOfType("patches.disablecmdline", C_BOOL)->value.intBoolVal)
393 <                DD_Patch_DisableCmdLine();
392 >        // Disables weapon cooldown exploit
393 >        if (DDrConfig_GetOptOfType("gameplay.cooldowntimer", C_BOOL)->value.intBoolVal)
394 >        {
395 >                // In WPrRelease: NoOp 4 MOVs
396 >                DDrPatch_NOOP((char*)(OniExe + 0x0011a825), 22);
397 >        }
398  
399 <        if (DDrConfig_GetOptOfType("patches.fonttexturecache", C_BOOL)->value.intBoolVal)
400 <                DD_Patch_FontTextureCache();
399 >        // Daodan device mode enumeration function
400 >        if (DDrConfig_GetOptOfType("graphics.displayenum", C_BOOL)->value.intBoolVal)
401 >        {
402 >                DDrPatch_MakeJump((void*)gl_enumerate_valid_display_modes, (void*)DD_GLrEnumerateDisplayModes);
403 >        }
404 >        
405 >        // Forced DirectInput (for Windows NT)
406 >        if (DDrConfig_GetOptOfType("windows.directinput", C_BOOL)->value.intBoolVal)
407 >        {
408 >                // LIrPlatform_Initialize: replace conditional jump by unconditional
409 >                DDrPatch_Byte((char*)(OniExe + 0x00002e6d), 0xeb);
410 >        }
411  
412 <        if (DDrConfig_GetOptOfType("patches.getcmdline", C_BOOL)->value.intBoolVal)
413 <                DD_Patch_GetCmdLine();
412 >        // Disable Oni's command line parser so it doesn't interfere with ours
413 >        if (DDrConfig_GetOptOfType("windows.disablecmdline", C_BOOL)->value.intBoolVal)
414 >        {
415 >                // Replace start of OniParseCommandLine with XOR eax,eax; RET
416 >                DDrPatch_Int32 ((int*)(OniExe + 0x000d3570), 0x00c3c033);
417 >                // NoOp first 51 byte in ONiMain, including tests and conditional exec of CLrGetCommandLine
418 >                DDrPatch_NOOP((char*)(OniExe + 0x000d3280), 51);
419 >        }
420  
421 <        if (DDrConfig_GetOptOfType("patches.hdscreens_lowres", C_BOOL)->value.intBoolVal)
422 <                DD_Patch_HDScreens_LowRes();
421 >        // Font texture cache doubled
422 >        if (DDrConfig_GetOptOfType("language.fonttexturecache", C_BOOL)->value.intBoolVal)
423 >        {
424 >                // Double two values in TMrGame_Initialize
425 >                DDrPatch_Byte((char*)(OniExe + 0x00020ea7), 0x20);
426 >                DDrPatch_Byte((char*)(OniExe + 0x00020f4a), 0x40);
427 >        }
428 >
429 >        // Allow HD screens on resolutions < 1024*768
430 >        if (DDrConfig_GetOptOfType("modding.hdscreens_lowres", C_BOOL)->value.intBoolVal)
431 >        {
432 >                DDrPatch_MakeJump((void*)M3rDraw_BigBitmap, (void*)DD_M3rDraw_BigBitmap);
433 >        }
434  
435 <        if (DDrConfig_GetOptOfType("patches.highres_console", C_BOOL)->value.intBoolVal)
436 <                DD_Patch_HighresConsole();
435 >        // Allow for console to show on higher resolutions
436 >        if (DDrConfig_GetOptOfType("devmode.highres_console", C_BOOL)->value.intBoolVal)
437 >        {
438 >                Oni_COrTextArea_Resize = DDrPatch_MakeDetour((void*)COrTextArea_Resize, (void*)DD_COrTextArea_Resize);
439 >        }
440          
441 <        if (DDrConfig_GetOptOfType("patches.kickguns", C_BOOL)->value.intBoolVal)
442 <                DD_Patch_KickGuns();
441 >        // Hackish fix for Konoko not kicking guns
442 >        // Don't use this, it breaks stairs.
443 >        if (DDrConfig_GetOptOfType("gameplay.kickguns", C_BOOL)->value.intBoolVal)
444 >        {
445 >                // In ONrCharacter_EnablePhysics: Load different values to same addresses as before
446 >                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 };
447 >                DDrPatch_Const ((char*)(OniExe + 0x000dc420), kickgun_patch);
448 >        }
449          
450 <        //if (patch_killvtune)
451 <        //      DD_Patch_KillVTune();
450 >        // Disable loading the vtuneapi.dll
451 >        if (DDrConfig_GetOptOfType("windows.killvtune", C_BOOL)->value.intBoolVal)
452 >        {
453 >                // Instantly return from UUrLoadVtuneAPI
454 >                DDrPatch_Byte((char*)(OniExe + 0x00026340), 0xC3);
455 >        }
456  
457 <        if (DDrConfig_GetOptOfType("patches.largetextures", C_BOOL)->value.intBoolVal)
458 <                DD_Patch_LargeTextures();
457 >        // Now supports textures up to 512x512
458 >        if (DDrConfig_GetOptOfType("modding.largetextures", C_BOOL)->value.intBoolVal)
459 >        {
460 >                DDrPatch_Byte((char*)(OniExe + 0x00005251), 0x10);
461 >        }
462          
463 <        if (DDrConfig_GetOptOfType("patches.levelplugins", C_BOOL)->value.intBoolVal)
464 <                DD_Patch_LevelPlugins();
463 >        // Non-"_Final" levels are now valid
464 >        if (DDrConfig_GetOptOfType("modding.levelplugins", C_BOOL)->value.intBoolVal)
465 >        {
466 >                // Patch in TMrUtility_LevelInfo_Get:
467 >                DDrPatch_Byte((char*)(OniExe + 0x000206a8), 0x01);
468 >        }
469  
470 <        if (DDrConfig_GetOptOfType("patches.newweap", C_BOOL)->value.intBoolVal)
471 <                DD_Patch_NewWeap();
470 >        // Weapon on ground shown with name and magazine contents
471 >        if (DDrConfig_GetOptOfType("graphics.newweap", C_BOOL)->value.intBoolVal)
472 >        {
473 >                //Makes it always say "Received weapon_name."
474 >                //Needs check for loc_4DFC66
475 >                //DDrPatch_NOOP((char*)(OniExe + 0x000E4DF8),2);
476 >
477 >                //Adds Weapon name and ammo meter to pickup autoprompt (patches to ONrGameState_ProcessHeartbeat)
478 >                // Do not call WPrHasAmmo and ignore conditional jump:
479 >                DDrPatch_NOOP((char*)(OniExe + 0x000FAC73), 9);
480 >                // Do not load ecx with some magic value?
481 >                DDrPatch_NOOP((char*)(OniExe + 0x000FAC80), 5);
482 >                // Replace call to ONiGameState_FindAutoPromptMessage
483 >                DDrPatch_MakeCall((void*)(OniExe + 0xFAC85), (void*)DDrWeapon2Message);
484 >        
485 >                //Moves location of colors
486 >                //DDrPatch_Int32((int*)(OniExe + 0x0002E3D5), (int)&DDrDSayColors );
487 >                //DDrPatch_Int32((int*)(OniExe + 0x0002E3DA), (int)&DDrDSayColors );
488 >        }
489  
490 <        if (DDrConfig_GetOptOfType("patches.nomultibyte", C_BOOL)->value.intBoolVal)
491 <                DD_Patch_NoMultiByte();
490 >        // Disable Multi-byte character awareness patch (multiple language support)
491 >        if (DDrConfig_GetOptOfType("language.nomultibyte", C_BOOL)->value.intBoolVal)
492 >        {
493 >                // TSiContext_DrawLine: Replace conditional jumps by unconditional ones
494 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002d8f8), 0xeb);
495 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002d9ad), 0xeb);
496 >                // TSiContext_DrawTextLine: same
497 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002dbe2), 0xeb);
498 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002dec3), 0xeb);
499 >                // TSrContext_FormatString: same
500 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002e2ab), 0xeb);
501 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002e2c4), 0xeb);
502 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002e379), 0xeb);
503 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002e48c), 0xeb);
504 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002e4d0), 0xeb);
505 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002e4f4), 0xeb);
506 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002e646), 0xeb);
507 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002e695), 0xeb);
508 >                // TSrContext_GetStringRect: same
509 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002e944), 0xeb);
510 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002e95d), 0xeb);
511 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002e98e), 0xeb);
512 >                DDrPatch_Byte  ((char*)(OniExe + 0x0002e9dc), 0xeb);
513 >        }
514  
515 <        if (DDrConfig_GetOptOfType("patches.optionsvisible", C_BOOL)->value.intBoolVal)
516 <                DD_Patch_OptionsVisible();
515 >        // Fix options not visible in main menu when a game was started
516 >        if (DDrConfig_GetOptOfType("graphics.optionsvisible", C_BOOL)->value.intBoolVal)
517 >        {
518 >                // replace WMrWindow_SetVisible calls
519 >                DDrPatch_MakeCall((void*)(OniExe + 0x000d2d2d), DDrShowOptionsButton);
520 >                DDrPatch_MakeCall((void*)(OniExe + 0x000d2d43), DDrShowResumeButton);
521 >        }
522  
523 <        if (DDrConfig_GetOptOfType("patches.particledisablebit", C_BOOL)->value.intBoolVal)
524 <                DD_Patch_ParticleDisableBit();
525 <        
526 <        if (DDrConfig_GetOptOfType("patches.pathfinding", C_BOOL)->value.intBoolVal)
527 <                DD_Patch_PathFinding();
523 >        // Pathfinding grid cache size x8
524 >        if (DDrConfig_GetOptOfType("gameplay.pathfinding", C_BOOL)->value.intBoolVal)
525 >        {
526 >                // Replaces conditional jump (je) with unconditional jump
527 >                const unsigned char pathfinding[2] = {0x90 , 0xE9 };
528 >                DDrPatch_Byte  ((char*)(OniExe + 0x0010b03b), 0x20);
529 >                DDrPatch_Byte  ((char*)(OniExe + 0x0010b04c), 0x20);
530  
531 <        if (DDrConfig_GetOptOfType("patches.projaware", C_BOOL)->value.intBoolVal)
532 <                DD_Patch_ProjAware();
531 >                //other stuff
532 >                DDrPatch_Const((char*)(OniExe + 0x00040789), pathfinding);
533 >        }
534  
535 <        if (DDrConfig_GetOptOfType("patches.safeprintf", C_BOOL)->value.intBoolVal)
536 <                DD_Patch_SafePrintf();
535 >        // Projectile awareness fixed
536 >        if (DDrConfig_GetOptOfType("gameplay.projaware", C_BOOL)->value.intBoolVal)
537 >        {
538 >                DDrPatch_Byte  ((char*)(OniExe + 0x0009c07c), 0x6c);
539 >                DDrPatch_Byte  ((char*)(OniExe + 0x0009c080), 0x70);
540 >                DDrPatch_Byte  ((char*)(OniExe + 0x0009c084), 0x74);
541 >                DDrPatch_Byte  ((char*)(OniExe + 0x0009c110), 0x6c);
542 >        }
543  
544 <        if (DDrConfig_GetOptOfType("patches.showalllasersights", C_BOOL)->value.intBoolVal)
545 <                DD_Patch_ShowAllLasersights();
544 >        // Safe startup message printer
545 >        if (DDrConfig_GetOptOfType("windows.safeprintf", C_BOOL)->value.intBoolVal)
546 >        {
547 >                DDrPatch_MakeJump((void*)UUrStartupMessage, (void*)DDrStartupMessage);
548 >        }
549  
550 <        if (DDrConfig_GetOptOfType("patches.showtriggervolumes", C_BOOL)->value.intBoolVal)
551 <                DD_Patch_ShowTriggerVolumes();
550 >        // Show all (also enemies') lasersights
551 >        if (DDrConfig_GetOptOfType("graphics.showalllasersights", C_BOOL)->value.intBoolVal)
552 >        {
553 >                DDrPatch_NOOP((char*)(OniExe + 0x000E1957), 6 );
554 >        }
555 >
556 >        // Allow bsl-var show_triggervolumes or ctrl+shift+x (devmode) to work
557 >        if (DDrConfig_GetOptOfType("devmode.showtriggervolumes", C_BOOL)->value.intBoolVal)
558 >        {
559 >                Oni_ONrMechanics_Register = DDrPatch_MakeDetour((void*)ONrMechanics_Register, (void*)DD_ONrMechanics_Register);
560 >                Oni_ONrGameState_HandleUtilityInput = DDrPatch_MakeDetour((void*)ONrGameState_HandleUtilityInput, (void*)DD_ONrGameState_HandleUtilityInput);
561 >        }
562          
563 <        if (DDrConfig_GetOptOfType("patches.throwtest", C_BOOL)->value.intBoolVal)
564 <                DD_Patch_Throwtest();
563 >        // Experiment with allowing enemies to be thrown over railings
564 >        if (DDrConfig_GetOptOfType("gameplay.throwtest", C_BOOL)->value.intBoolVal)
565 >        {
566 >                DDrPatch_NOOP((char*)(OniExe + 0x000dc190), 10);
567 >        }
568  
569 <        if (DDrConfig_GetOptOfType("patches.usedaodangl", C_BOOL)->value.intBoolVal)
570 <                DD_Patch_UseDaodanGL();
569 >        // DaodanGL with windowed mode support
570 >        if (DDrConfig_GetOptOfType("graphics.daodangl", C_BOOL)->value.intBoolVal)
571 >        {
572 >                // LIrPlatform_Mode_Set: GetWindowRect -> GetClientRect.
573 >                DDrPatch_NOOP((char*) OniExe + 0x00002dd6, 6);
574 >                DDrPatch_MakeCall((char*) OniExe + 0x00002dd6, (void*) GetClientRect);
575 >
576 >                // UUrWindow_GetSize: GetWindowRect -> GetClientRect.
577 >                DDrPatch_NOOP((char*) OniExe + 0x0002651c, 6);
578 >                DDrPatch_MakeCall((char*) OniExe + 0x0002651c, (void*) GetClientRect);
579 >
580 >                // LIrPlatform_PollInputForAction: fix GetCursorPos call to return client coordinates.
581 >                DDrPatch_NOOP((char*) OniExe + 0x000032cc, 6);
582 >                DDrPatch_MakeCall((char*) OniExe + 0x000032cc, (void*) DD_GetCursorPos);
583 >
584 >                // LIrPlatform_InputEvent_GetMouse: fix GetCursorPos call to return client coordinates.
585 >                DDrPatch_NOOP((char*) OniExe + 0x00002cc2, 6);
586 >                DDrPatch_MakeCall((char*) OniExe + 0x00002cc2, (void*) DD_GetCursorPos);
587 >
588 >                // LIrPlatform_PollInputForAction: translate SetCursorPos position to screen coordinates.
589 >                DDrPatch_NOOP((char*) OniExe + 0x000032b7, 6);
590 >                DDrPatch_MakeCall((char*) OniExe + 0x000032b7, (void*) DD_SetCursorPos);
591 >
592 >                // LIrPlatform_PollInputForAction: translate SetCursorPos position to screen coordinates.
593 >                DDrPatch_NOOP((char*) OniExe + 0x00003349, 6);
594 >                DDrPatch_MakeCall((char*) OniExe + 0x00003349, (void*) DD_SetCursorPos);
595  
596 <        if (DDrConfig_GetOptOfType("patches.usegettickcount", C_BOOL)->value.intBoolVal)
597 <                DD_Patch_UseGetTickCount();
598 <        
599 <        if (DDrConfig_GetOptOfType("patches.wpfadetime", C_BOOL)->value.intBoolVal)
600 <                DD_Patch_WpFadetime();
596 >                // Replace ONrPlatformInitialize.
597 >                DDrPatch_MakeJump((void*) ONrPlatform_Initialize, (void*) DD_ONrPlatform_Initialize);
598 >
599 >                // Replace gl_platform_initialize.
600 >                DDrPatch_MakeJump((void*) gl_platform_initialize, (void*) DD_GLrPlatform_Initialize);
601  
602 +                // Replace gl_platform_dispose.
603 +                DDrPatch_MakeJump((void *) gl_platform_dispose, (void*) DD_GLrPlatform_Dispose);
604 +        }
605  
606 <        DD_Patch_DaodanInit();
606 >        // Performance patch
607 >        if (DDrConfig_GetOptOfType("windows.usegettickcount", C_BOOL)->value.intBoolVal)
608 >        {
609 >                DDrPatch_MakeJump((void*)UUrMachineTime_High, (void*)DDrMachineTime_High);
610 >                DDrPatch_MakeJump((void*)UUrMachineTime_High_Frequency, (void*)DDrMachineTime_High_Frequency);
611 >                DDrPatch_MakeJump((void*)UUrMachineTime_Sixtieths, (void*)DDrMachineTime_Sixtieths);
612 >        }
613 >
614 >        // Fix displaying the talking portraits in widescreen modes
615 >        if (DDrConfig_GetOptOfType("graphics.widescreenportraits", C_BOOL)->value.intBoolVal)
616 >        {
617 >                SLrDaodan_Patch();
618 >        }
619 >        
620 >        // Adds working function for existing BSL command wp_fadetime, sets fade time to 4800
621 >        if (DDrConfig_GetOptOfType("gameplay.wpfadetime", C_BOOL)->value.intBoolVal)
622 >        {
623 >                // Makes wp_fadetime actually have a function (changes within WPrRelease)
624 >                // Patches end of function to instead of use a constant value for fadetime (12c0 = 4800) actually use value of wp_fadetime:
625 >                // orig: MOV [esi+0x46], 0x12c0 ; POP ebx ; POP esi ; ADD esp, 0x14 ; RET
626 >                // new:  MOV bx, [0x627dc4] ; MOV [esi+0x46], bx ; POP ebx ; POP esi ; ADD esp, 0x14 ; RET
627 >                const unsigned char fadetime_patch[] = { 0x66, 0x8B, 0x1D, 0xC4, 0x7D, 0x62, 0x00, 0x66, 0x89, 0x5E, 0x46, 0x5B, 0x5E, 0x83, 0xC4, 0x14, 0xC3 };
628 >                DDrPatch_Const ((char*)(OniExe + 0x0011a889), fadetime_patch);
629 >                // Fixes jump because of new length of code in patch
630 >                DDrPatch_Byte  ((char*)(OniExe + 0x0011a560), 0x31);
631          
632 <        DD_Patch_GammaSlider();
632 >                // Sets the fadetime to 4800 by default (in WPrInitialize)
633 >                DDrPatch_Int16 ((short*)(OniExe + 0x0011ab0e), 4800);
634 >        }
635 >
636 >        // Adds new BSL functions
637 >        // Replaces an early unused call (OBJrLevel_Unload_Unknown_2) in ONiMain
638 >        DDrPatch_MakeCall((void*)(OniExe + 0x000d345a), (void*)DDrGame_Init);
639 >        
640 >        // Disable gamma slider in options in windowed mode
641 >        // In ONiOGU_Options_Callback: Replace WMrSlider_SetRange
642 >        DDrPatch_MakeCall((void*)(OniExe + 0x000d262c), (void*)DD_ONiOGU_GammaSlider_SetRange);
643  
644 <        DD_Patch_PrintWarning();
644 >        // Fix the warning print method
645 >        // Replace UUrError_Report_Internal
646 >        DDrPatch_MakeJump((void*)(OniExe + 0x000245A0), (void*)DDrPrintWarning);
647  
648          DD_Patch_ShowNames();
649  

Diff Legend

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