MM6Patch v2.5.7:

[*] Support (i.e. no problems like crashes) for old saves with inconsequential incorrect data caused by my bug fixed in the previous version.

MMPatches/Install/MM6patch/Files/MM6Patch ReadMe.TXT

@@ -1,4 +1,4 @@
-GrayFace MM6 Patch v2.5.6
+GrayFace MM6 Patch v2.5.7
 By Sergey Rozhenko <mailto:sergroj@mail.ru>
 https://grayface.github.io/
 
@@ -11,6 +11,10 @@ At the end of ReadMe you'll find info on how to report errors.
 
 ([+] - feature, [-] - fixed bug, [*] - other)
 
+New in version 2.5.7:
+  << MM6 - MM8 >>
+[*] Support (i.e. no problems like crashes) for old saves with inconsequential incorrect data caused by my bug fixed in the previous version.
+
 New in version 2.5.6:
   << MM6 - MM8 >>
 [+] New command available to map scripts (*.evt) that powers some of the MM6 and MM7 changes of this version (code 0x45 - RefundChestArtifacts).

MMPatches/Install/MM6patchBuka/Files/MM6Patch ReadMe_rus.TXT

@@ -1,4 +1,4 @@
-GrayFace MM6 Patch v2.5.6
+GrayFace MM6 Patch v2.5.7
 �����: ������ ������� <mailto:sergroj@mail.ru>
 https://grayface.github.io/ru/
 ������� ����� ReadMe �� �������: Black Phantom <mailto:mm6789@yandex.ru>
@@ -10,6 +10,10 @@ https://grayface.github.io/ru/
 
 ([+] - ����, [-] - ������������ ���, [*] - ������)
 
+��������� ������ 2.5.7:
+  << MM6 - MM8 >>
+[*] ��������� ���������� � ��������� �������, ���������� ���� �����, ������������ � ���������� ������. ������ ��� ������ ����� �� �� ��� �� ������.
+
 ��������� ������ 2.5.6:
   << MM6 - MM8 >>
 [+] ����� �������, ��������� ��� �������� ���� (*.evt), ������� ��������� ������� ��������� ��������� ����� � MM6 � MM7 (��� 0x45 - RefundChestArtifacts).

MMPatches/Install/MM6patchLoc/eng/MM6Patch ReadMe.TXT

@@ -1,4 +1,4 @@
-GrayFace MM6 Patch v2.5.6
+GrayFace MM6 Patch v2.5.7
 By Sergey Rozhenko <mailto:sergroj@mail.ru>
 https://grayface.github.io/
 
@@ -11,6 +11,10 @@ At the end of ReadMe you'll find info on how to report errors.
 
 ([+] - feature, [-] - fixed bug, [*] - other)
 
+New in version 2.5.7:
+  << MM6 - MM8 >>
+[*] Support (i.e. no problems like crashes) for old saves with inconsequential incorrect data caused by my bug fixed in the previous version.
+
 New in version 2.5.6:
   << MM6 - MM8 >>
 [+] New command available to map scripts (*.evt) that powers some of the MM6 and MM7 changes of this version (code 0x45 - RefundChestArtifacts).

MMPatches/Install/MM6patchLoc/rus/MM6Patch ReadMe_rus.TXT

@@ -1,4 +1,4 @@
-GrayFace MM6 Patch v2.5.6
+GrayFace MM6 Patch v2.5.7
 �����: ������ ������� <mailto:sergroj@mail.ru>
 https://grayface.github.io/ru/
 ������� ����� ReadMe �� �������: Black Phantom <mailto:mm6789@yandex.ru>
@@ -10,6 +10,10 @@ https://grayface.github.io/ru/
 
 ([+] - ����, [-] - ������������ ���, [*] - ������)
 
+��������� ������ 2.5.7:
+  << MM6 - MM8 >>
+[*] ��������� ���������� � ��������� �������, ���������� ���� �����, ������������ � ���������� ������. ������ ��� ������ ����� �� �� ��� �� ������.
+
 ��������� ������ 2.5.6:
   << MM6 - MM8 >>
 [+] ����� �������, ��������� ��� �������� ���� (*.evt), ������� ��������� ������� ��������� ��������� ����� � MM6 � MM7 (��� 0x45 - RefundChestArtifacts).

MMPatches/MM6Patch/MM6patch.dpr

@@ -355,6 +355,10 @@ Version 2.5.6:
 [-] My bug: DisableHooks option wasn't working for some hooks
 [-] My bug: With custom *.games.lod archives incorrect data was written to autosave on New Game start
 
+Version 2.5.7:
+(MM6-MM8)
+[*] No more crashes when playing saves with incorrect data from pre-2.5.6 bug in custom *.games.lod support
+
 
 Åñëè çàãðóçèòü ñåéâ, ãäå âñå ðîæè îäèíàêîâûå, à ïîòîì ñåéâ ñ ðàçíûìè, áóäóò ÷åðíûå ïÿòíà íà ìåñòå ðîæ
 

MMPatches/MMCommon/MMCommon.pas

@@ -76,6 +76,7 @@ interface
   hqDontSkipSimpleMessage = 88;
   hqFixItemDuplicates = 89;
   hqFixClubsGeneration = 90;
+  hqFixAcidBurst = 91;
 
 {$IFDEF mm6}
   m6 = 1;
@@ -191,6 +192,7 @@ interface
     DontSkipSimpleMessage: LongBool;          // (unused in MM8)
     FixItemDuplicates: LongBool;              //
     FixClubsGeneration: LongBool;             // (MM8 only)
+    FixAcidBurst: LongBool;                   // (unused in MM6)
   end;
 
 var
@@ -700,6 +702,7 @@   TSpellBuff = record
   _malloc: function(size:int):ptr cdecl = ptr(m6*$4AE753 + m7*$4CADC2 + m8*$4D9F62);
   _new: function(size:int):ptr cdecl = ptr(m6*$4AEBA5 + m7*$4CB06B + m8*$4D9E0B);
   _free: procedure(p:ptr) cdecl = ptr(m6*$4AE724 + m7*$4CAEFC + m8*$4DA09C);
+  _strcmpi: function(s1, s2: PChar): int cdecl = ptr(m6*$4AF370 + m7*$4CAAF0 + m8*$4DA920);
   _ProcessActions: TProcedure = ptr(m6*$42ADA0 + m7*$4304D6 + m8*$42EDD8);
   _LoadBitmap: function(_, __, this: int; pal: {$IFNDEF mm8}int{$ELSE}int64{$ENDIF}; name: PChar): int = ptr(m6*$40B430 + m7*$40FB2C + m8*$410D70);
   _DrawBmpTrans: procedure(_, __, screen: int; bmp:{$IFNDEF mm8}uint{$ELSE}uint64{$ENDIF}; y, x: int) = ptr(m7*$4A6204 + m8*$4A419B);
@@ -1245,6 +1248,7 @@ procedure LoadIni;
       FixSouldrinker:= ReadBool('FixSouldrinker', true, false);
       FixClubsDelay:= ReadBool('FixClubsDelay', true, false);
       ClimbBetter:= ReadBool('ClimbBetter', true, false);
+      FixAcidBurst:= ReadBool('FixAcidBurst', true, false);
 {$ENDIF}
       FixHouseAnimationRestart:= ReadBool('FixHouseAnimationRestart', true, false);
       info:= 'Makes right mouse button act as Esc in houses, NPC, map entrance and message dialogs';

MMPatches/MMCommon/MMHooks.pas

@@ -1457,8 +1457,11 @@ procedure UnmarkChestArtifacts(a: PChest);
 //      inc(Result);
 //end;
 
-procedure RefillAnyProc(buf: pchar);
+procedure RefillAnyProc(buf: pchar; skip: int);
 begin
+  if pint(buf - 4 - 32*(1 - m6))^ = 0 then
+    exit;  // never visited before
+  inc(buf, skip);
   if m6 = 0 then
     inc(buf, _SpritesCount^*2);
   inc(buf, 4 + pint(buf)^*_MonOff_Size);
@@ -1470,17 +1473,15 @@ procedure RefillAnyProc(buf: pchar);
 
 procedure RefillBlvProc(buf: pchar);
 begin
-  inc(buf, _VisibleOutlinesSize^ + (1 - m6)*_IndoorFacetsCount^*4);
-  RefillAnyProc(buf);
+  RefillAnyProc(buf, _VisibleOutlinesSize^ + (1 - m6)*_IndoorFacetsCount^*4);
 end;
 
 var
   OdmFacetBitsCount: int;
 
 procedure RefillOdmProc(buf: pchar);
 begin
-  inc(buf, 968*2 + OdmFacetBitsCount*4);
-  RefillAnyProc(buf);
+  RefillAnyProc(buf, 968*2 + OdmFacetBitsCount*4);
 end;
 
 procedure RefillBlvHook;
@@ -3514,9 +3515,17 @@ procedure FixSouldrinkerHook;
 //----- Acid Burst doing physical damage
 
 procedure FixAcidBurst;
+const
+  sNone: PChar = 'none';
 asm
   cmp dword ptr [esp + $24 - 8], 29
   jnz @std
+  push esi
+  push sNone
+  call _strcmpi
+  add esp, 8
+  test eax, eax
+  jnz @std
   mov byte ptr [edi], 2
 @std:
 end;
@@ -4387,7 +4396,7 @@ procedure ReadGamesFileHook;
     (p: $40570B; newp: @FixShrapmetal; t: RShtBefore; Querry: hqFixMonsterSpells), // Fix monsters' Shrapmetal spread
     (p: $47BB77; newp: @FixSpritesWrapAround; t: RShtBefore; size: 7), // Don't show sprites from another side of the map with increased FOV
     (p: $42E4F0; old: $43642D; newp: @FixSouldrinkerHook; t: RShtCall; Querry: hqFixSouldrinker), // Souldrinker was hitting monsters beyond party range
-    (p: $453A31; old: $453AE6; newp: @FixAcidBurst; t: RShtBeforeJmp6), // Acid Burst doing physical damage
+    (p: $453A31; old: $453AE6; newp: @FixAcidBurst; t: RShtBeforeJmp6; Querry: hqFixAcidBurst), // Acid Burst doing physical damage
     (p: $404B02; newp: @FixMonSpellCast; t: RShtBefore), // Spells that couldn't be cast by monsters before
     (p: $468FCF; newp: @EquipOnSpearHook; t: RShtAfter; size: 6), // Unable to equip sword or dagger when non-master spear is equipped
     (p: $469037; size: $469041 - $469037), // Unable to equip sword or dagger when non-master spear is equipped
@@ -4532,7 +4541,7 @@ procedure ReadGamesFileHook;
     (p: $40531F; newp: @FixShrapmetal; t: RShtBefore; size: 8; Querry: hqFixMonsterSpells), // Fix Shrapmetal spread
     (p: $47AE66; newp: @FixSpritesWrapAround; t: RShtBefore; size: 7), // Don't show sprites from another side of the map with increased FOV
     (p: $42C730; old: $433D70; newp: @FixSouldrinkerHook; t: RShtCall; Querry: hqFixSouldrinker), // Souldrinker was hitting monsters beyond party range
-    (p: $45119B; old: $451250; newp: @FixAcidBurst; t: RShtBeforeJmp6), // Acid Burst doing physical damage
+    (p: $45119B; old: $451250; newp: @FixAcidBurst; t: RShtBeforeJmp6; Querry: hqFixAcidBurst), // Acid Burst doing physical damage
     (p: $467453; newp: @EquipOnSpearHook; t: RShtAfter; size: 6), // Unable to equip sword or dagger when non-master spear is equipped
     (p: $4674BB; size: $4674C5 - $4674BB), // Unable to equip sword or dagger when non-master spear is equipped
     (p: $40EFC3; newp: @FixArcomage; t: RShtAfter; size: 6), // Fix Arcomage hanging
@@ -4644,6 +4653,8 @@ procedure ApplyMMDeferredHooks;
     ApplyHooks(hqDontSkipSimpleMessage);
   if Options.FixItemDuplicates then
     ApplyHooks(hqFixItemDuplicates);
+  if Options.FixAcidBurst then
+    ApplyHooks(hqFixAcidBurst);
 end;
 
 procedure ApplyMMHooksSW;