Changeset 693

Timestamp:

Mar 7, 2013, 11:38:21 PM (12 years ago)

Author:

alloc

Message:

Daodan: Added options-button-fix

Location:

Daodan/src

Files:

• Daodan.c (modified) (4 diffs)
• Oni_Symbols.h (modified) (1 diff)
• _Version.h (modified) (1 diff)

Daodan/src/Daodan.c

@@ -40 +40 @@
 bool patch_getcmdline = true;
 bool patch_disablecmdline = true;
+bool patch_optionsvisible = true;
 
 bool patch_safeprintf = true;
@@ -57 +58 @@
 typedef int (__cdecl *CHINESEPROC)(DWORD WINAPI); 
 bool patch_chinese = false;
+
+
+
+void ONICALL DDrShowResumeButton(int window, int visibility)
+{
+        if (visibility)
+                WMrWindow_SetLocation(window, 150, 350);
+        WMrWindow_SetVisible(window, visibility);
+}
+
+
+/* Options always visible patch */
+void ONICALL DDrShowOptionsButton(int window, int visibility)
+{
+        WMrWindow_SetVisible(window, 1);
+}
+
+
+
 bool DDrPatch_Init()
 {
@@ -280 +300 @@
 //FLATLINE?     DDrPatch_MakeCall((void*)(OniExe + 0x000C26CB), FLrHook_DoorOpen); 
 //FLATLINE?     DDrPatch_MakeCall((void*)(OniExe + 0x000EE3CF), FLrHook_ConsoleActivate);
+
+
+        // Fix options not visible in main menu when a game was started
+        if(patch_optionsvisible)
+        {
+                DDrPatch_MakeCall((void*)(OniExe + 0x000d2d2d), DDrShowOptionsButton);
+                DDrPatch_MakeCall((void*)(OniExe + 0x000d2d43), DDrShowResumeButton);
+        }
+
         return true;
 }
+
 
 enum {s_unknown, s_options, s_patch, s_bsl, s_language} ini_section;
@@ -387 +417 @@
                         else if (!_stricmp(name, "newweap"))
                                 patch_newweapon = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "optionsvisible"))
+                                patch_optionsvisible = !_stricmp(inifile_cleanstr(value), "true");
                         else
                                 DDrStartupMessage("unrecognised patch \"%s\"", name);

Daodan/src/Oni_Symbols.h

@@ -197 +197 @@
 DefFunc(void, AI2rDisplayDebuggingInfo, ONICALL, (Character* Char), 0x0048C5F0);
 DefFunc(uint32_t, M3rTextureMap_New, ONICALL, (short width, short height, int type, int allocated, int flags, char* name, void** output), 0x041EB00);
+
+// Make a dialog element (in)visible and change its position
+DefFunc(void, WMrWindow_SetVisible, ONICALL, (int window, int visibility), 0x00475a10);
+DefFunc(void, WMrWindow_SetLocation, ONICALL, (int window, int x, int y), 0x004756d0);
+
 #undef DefFunc
 

Daodan/src/_Version.h

@@ -6 +6 @@
 
 #define DAODAN_VERSION_MAJOR 3
-#define DAODAN_VERSION_MINOR 1
+#define DAODAN_VERSION_MINOR 2
 #define DAODAN_VERSION_STRING STRINGIZE(DAODAN_VERSION_MAJOR) "." STRINGIZE(DAODAN_VERSION_MINOR)