Changeset 843

Timestamp:

Apr 30, 2013, 3:06:45 AM (12 years ago)

Author:

alloc

Message:

Daodan:

• Change "multibyte" param to "nomultibyte"

Location:

Daodan/src

Files:

• Daodan_Config.c (modified) (3 diffs)
• Daodan_Config.h (modified) (1 diff)
• patches/Patches.c (modified) (3 diffs)

Daodan/src/Daodan_Config.c

@@ -30 +30 @@
 bool patch_largetextures = true;
 bool patch_levelplugins = true;
-bool patch_multibyte = false;
 bool patch_newweapon = true;
+bool patch_nomultibyte = true;
 bool patch_optionsvisible = true;
 bool patch_particledisablebit = false;
@@ -86 +86 @@
                         else if (!_stricmp(name, "ignore_private_data"))
                                 opt_ignore_private_data = !_stricmp(inifile_cleanstr(value), "true");
-                        else if (!_stricmp(name, "multibyte"))
-                                patch_multibyte = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "nomultibyte"))
+                                patch_nomultibyte = !_stricmp(inifile_cleanstr(value), "true");
                         else if (!_stricmp(name, "sound"))
                                 opt_sound = !_stricmp(inifile_cleanstr(value), "true");
@@ -138 +138 @@
                         else if (!_stricmp(name, "levelplugins"))
                                 patch_levelplugins = !_stricmp(inifile_cleanstr(value), "true");
-                        else if (!_stricmp(name, "multibyte"))
-                                patch_multibyte = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "nomultibyte"))
+                                patch_nomultibyte = !_stricmp(inifile_cleanstr(value), "true");
                         else if (!_stricmp(name, "newweap"))
                                 patch_newweapon = !_stricmp(inifile_cleanstr(value), "true");

Daodan/src/Daodan_Config.h

@@ -25 +25 @@
 extern bool patch_largetextures;
 extern bool patch_levelplugins;
-extern bool patch_multibyte;
 extern bool patch_newweapon;
+extern bool patch_nomultibyte;
 extern bool patch_optionsvisible;
 extern bool patch_particledisablebit;

Daodan/src/patches/Patches.c

@@ -263 +263 @@
 }
 
-// Multi-byte patch (multiple language support)
-void DD_Patch_MultiByte()
+// Weapon on ground shown with name and magazine contents
+void DD_Patch_NewWeap()
+{
+        //Makes it always say "Received weapon_name."
+        //Needs check for loc_4DFC66
+        //DDrPatch_NOOP((char*)(OniExe + 0x000E4DF8),2);
+
+        //Adds Weapon name and ammo meter to pickup autoprompt
+        DDrPatch_NOOP((char*)(OniExe + 0x000FAC73), 9);
+        DDrPatch_NOOP((char*)(OniExe + 0x000FAC80), 5);
+        DDrPatch_MakeCall((void*)(OniExe + 0xFAC85), (void*)DDrWeapon2Message);
+        
+        //Moves location of colors
+        //DDrPatch_Int32((int*)(OniExe + 0x0002E3D5), (int)&DDrDSayColors );
+        //DDrPatch_Int32((int*)(OniExe + 0x0002E3DA), (int)&DDrDSayColors );
+}
+
+// Disable Multi-byte character awareness patch (multiple language support)
+void DD_Patch_NoMultiByte()
 {
         DDrPatch_Byte  ((char*)(OniExe + 0x0002d8f8), 0xeb);
@@ -284 +301 @@
 }
 
-// Weapon on ground shown with name and magazine contents
-void DD_Patch_NewWeap()
-{
-        //Makes it always say "Received weapon_name."
-        //Needs check for loc_4DFC66
-        //DDrPatch_NOOP((char*)(OniExe + 0x000E4DF8),2);
-
-        //Adds Weapon name and ammo meter to pickup autoprompt
-        DDrPatch_NOOP((char*)(OniExe + 0x000FAC73), 9);
-        DDrPatch_NOOP((char*)(OniExe + 0x000FAC80), 5);
-        DDrPatch_MakeCall((void*)(OniExe + 0xFAC85), (void*)DDrWeapon2Message);
-        
-        //Moves location of colors
-        //DDrPatch_Int32((int*)(OniExe + 0x0002E3D5), (int)&DDrDSayColors );
-        //DDrPatch_Int32((int*)(OniExe + 0x0002E3DA), (int)&DDrDSayColors );
-}
-
 // Fix options not visible in main menu when a game was started
 void DD_Patch_OptionsVisible()
@@ -482 +482 @@
                 DD_Patch_LevelPlugins();
 
-        if (!patch_multibyte)
-                DD_Patch_MultiByte();
-
         if (patch_newweapon)
                 DD_Patch_NewWeap();
+
+        if (patch_nomultibyte)
+                DD_Patch_NoMultiByte();
 
         if(patch_optionsvisible)