feat(Era): Update Era source code to 3.9.11. Commit: cd31685

Signed-off-by: VuceticBranislav <[email protected]>

.gitignore

@@ -72,4 +72,5 @@ modules/
 Vfs/_LOG_.txt
 Vfs/dunit.ini
 !**/mms.cfg
-VersionInfo.res
+VersionInfo.res
+Compiled/

Era/Erm.pas

@@ -1499,6 +1499,9 @@ procedure OnEraLoadScripts (Event: GameExt.PEvent); stdcall;
   RegisterErmEventNames;
 
   (* Load scripts *)
+  // Hack to fix HD mods load from battle functionality, using GOTO and leaving dirty memory state
+  ErmTriggerDepth := 0;
+
   ScriptMan.LoadScriptsFromSavedGame;
 end;
 
@@ -5912,6 +5915,9 @@ function Hook_FindErm_BeforeMainLoop (Context: Core.PHookContext): longbool; std
   GLOBAL_EVENT_SIZE = 52;
 
 begin
+  // Hack to fix HD mods load from battle functionality, using GOTO and leaving dirty memory state
+  ErmTriggerDepth := 0;
+
   // Skip internal map events: GEp_ = GEp1 - [sizeof(_GlbEvent_) = 52]
   pinteger(Context.EBP - $3F4)^ := pinteger(pinteger(Context.EBP - $24)^ + $88)^ - GLOBAL_EVENT_SIZE;
   ErmErrReported                := false;

Era/VersionInfo.inc

@@ -1,6 +1,6 @@
 VER_Major     = 3;
 VER_Minor     = 9;
-VER_Build     = 10;
+VER_Build     = 11;
 VER_Revision  = 0;
 VER_Sufix     = '-port';
 

Era/VersionInfo.rc

@@ -13,8 +13,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION                           3,9,10,0
-PRODUCTVERSION                        3,9,10,0
+FILEVERSION                           3,9,11,0
+PRODUCTVERSION                        3,9,11,0
 FILEFLAGSMASK                         VS_FFI_FILEFLAGSMASK
 FILEFLAGS                             (VER_PRIVATEBUILD | VER_PRERELEASE | VER_DEBUG)
 FILEOS                                VOS_NT | VOS__WINDOWS32
@@ -25,8 +25,8 @@ BEGIN
     BEGIN
         BLOCK "000004E4"
         BEGIN
-            VALUE "ProductVersion",   "3.9.10.0\0"
-            VALUE "FileVersion",      "3.9.10.0\0"
+            VALUE "ProductVersion",   "3.9.11.0\0"
+            VALUE "FileVersion",      "3.9.11.0\0"
             VALUE "CompanyName",      "BerSoft\0"
             VALUE "FileDescription",  "Era Project\0"
             VALUE "InternalName",     "\0"

README.md

@@ -28,7 +28,7 @@
     Contains ERA and VFS projects as well as B2 library.<br/>
     <br/></i>
     Original commits containing code are from <a href="https://github.com/ethernidee">ethernidee</a> repositories:<br/>
-    ERA: <a href="https://github.com/ethernidee/era/tree/0d64ad2cd6f7bbbc23eded39d22184969c1ad506"><strong>0d64ad2</strong></a><br/>
+    ERA: <a href="https://github.com/ethernidee/era/tree/cd3168559af47394618fe2e3bbb6ac47874ac9f8"><strong>cd31685</strong></a><br/>
     VFS: <a href="https://github.com/ethernidee/vfs/tree/f18d56dcb7ddee787c01680b98f078fe409359e9"><strong>f18d56d</strong></a><br/>
     B2:   <a href="https://github.com/ethernidee/b2/tree/001251eb5f45378c329b6a60a4a4d87c346f36a0"><strong>001251e</strong></a>
   </p>