3.0.5666.14749

FFXIVAPP · Jul 7, 2015 · ca885a3 · ca885a3
1 parent 85e1fa0
commit ca885a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/FFXIVAPP.Client/Memory/PlayerInfoWorker.cs b/FFXIVAPP.Client/Memory/PlayerInfoWorker.cs
@@ -128,11 +128,8 @@ private void ScanTimerElapsed(object sender, ElapsedEventArgs e)
                                     enmityStructure = MemoryHandler.Instance.SigScanner.Locations["CHARMAP"] + 3384;
                                     break;
                                 default:
-                                    enmityStructure = MemoryHandler.ResolvePointerPath("AGRO");
                                     enmityCount = MemoryHandler.Instance.GetInt16(MemoryHandler.ResolvePointerPath("AGRO_COUNT"));
-
-                                    //enmityCount = MemoryHandler.Instance.GetInt16(MemoryHandler.Instance.SigScanner.Locations["CHARMAP"] + 0x16C35C); // 0x1C590); // 116032
-                                    //enmityStructure = MemoryHandler.Instance.SigScanner.Locations["CHARMAP"] + 0x16BA5C; // 0x1CE94; // 118340;
+                                    enmityStructure = MemoryHandler.ResolvePointerPath("AGRO");
                                     break;
                             }
                             var enmityEntries = new List<EnmityEntry>();
@@ -199,10 +196,10 @@ private void ScanTimerElapsed(object sender, ElapsedEventArgs e)
                                     PlayerInfoMap = MemoryHandler.Instance.SigScanner.Locations["CHARMAP"] + 5724;
                                     break;
                                 default:
-                                    //PlayerInfoMap = MemoryHandler.Instance.SigScanner.Locations["CHARMAP"] + 0x16C380; // old: 115996;
+                                    PlayerInfoMap = MemoryHandler.ResolvePointerPath("PLAYERINFO");
                                     break;
                             }
-                            MemoryHandler.Instance.SigScanner.Locations.Add("PLAYERINFO", MemoryHandler.ResolvePointerPath("PLAYERINFO"));
+                            MemoryHandler.Instance.SigScanner.Locations.Add("PLAYERINFO", PlayerInfoMap);
                         }
                         catch (Exception ex)
                         {

diff --git a/distribution/FFXIVAPP.Client.exe b/distribution/FFXIVAPP.Client.exe