Fix monsters despawning when height-difference is too great

emoose · Oct 4, 2021 · 6fea533 · 6fea533
1 parent 094c98f
commit 6fea533
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/SDK/Basic.h b/src/SDK/Basic.h
@@ -138,6 +138,8 @@ struct TArray
 
 	inline int Num() const
 	{
+		if (!Data)
+			return 0;
 		return Count;
 	};
 

diff --git a/src/dllmain.cpp b/src/dllmain.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 
-#define SDK_VERSION "0.1.25"
+#define SDK_VERSION "0.1.25a"
 
 const uint32_t Addr_Timestamp = 0x1E0;
 const uint32_t Value_Timestamp = 1626315361; // 2021/07/15 02:16:01
@@ -143,9 +143,10 @@ bool AEncountGroup__IsWithinRange_Hook(AEncountGroup* thisptr, struct FEncountAr
   if (AreaInfo != &thisptr->SpawnAreaInfo)
     return AEncountGroup__IsWithinRange_Orig(thisptr, AreaInfo);
 
-  FEncountAreaInfo NewAreaInfo(*AreaInfo);
-  NewAreaInfo.Range *= Options.MonsterDistanceMultiplier;
-  // todo: should we update NewAreaInfo.HalfHeight?
+  FEncountAreaInfo NewAreaInfo;
+  NewAreaInfo.Range = AreaInfo->Range * Options.MonsterDistanceMultiplier;
+  NewAreaInfo.HalfHeight = AreaInfo->HalfHeight * Options.MonsterDistanceMultiplier;
+
   return AEncountGroup__IsWithinRange_Orig(thisptr, &NewAreaInfo);
 }
 

diff --git a/src/resource.rc b/src/resource.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,25,0
- PRODUCTVERSION 0,1,25,0
+ FILEVERSION 0,1,25,1
+ PRODUCTVERSION 0,1,25,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "emoose"
             VALUE "FileDescription", "Arise-SDK - improvement extension for Tales of Arise"
-            VALUE "FileVersion", "0.1.25.0"
+            VALUE "FileVersion", "0.1.25.1"
             VALUE "InternalName", "Arise-SDK.dll"
             VALUE "LegalCopyright", "emoose - 2021"
             VALUE "OriginalFilename", "Arise-SDK.dll"
             VALUE "ProductName", "Arise-SDK"
-            VALUE "ProductVersion", "0.1.25.0"
+            VALUE "ProductVersion", "0.1.25.1"
         END
     END
     BLOCK "VarFileInfo"