Merge remote-tracking branch 'origin/master'

Offsets/2019.10.24.0000.0000.json

@@ -0,0 +1,7 @@
+{
+  "WaymarkClassPtr": 29604416, // 1C3BA40
+  "WaymarkFunc": 7958240, // 796EE0
+  "Waymarks": 29604832, // 1C3BBE0
+  "MapID": 222 // 333,
+  "ActorTable": 29367696 // 1C01D90
+}

PaisleyPark/Models/Offsets.cs

@@ -1,9 +1,10 @@
-namespace PaisleyPark.Models
+namespace PaisleyPark.Models
 {
     public class Offsets
     {
         public int WaymarkClassPtr { get; set; }
         public int WaymarkFunc { get; set; }
         public int Waymarks { get; set; }
+        public int ActorTable { get; set; }
     }
 }

PaisleyPark/ViewModels/MainWindowViewModel.cs

@@ -25,7 +25,6 @@ public class MainWindowViewModel : BindableBase
 	{
 		public static IEventAggregator EventAggregator { get; private set; }
 		private NhaamaProcess GameProcess { get; set; }
-		private Definitions GameDefinitions { get; set; }
 		private BackgroundWorker Worker;
 		public static Memory GameMemory { get; set; } = new Memory();
 		public Settings UserSettings { get; set; }
@@ -453,18 +452,6 @@ private bool InitializeNhaama()
 				Application.Current.Shutdown();
 			}
 
-			// Load in the definitions file.
-			try
-			{
-				GameDefinitions = Definitions.Get(GameProcess, gameVersion, Game.GameType.Dx11);
-			}
-			catch (Exception ex)
-			{
-				MessageBox.Show("Couldn't fetch latest definitions for Nhaama.", "Paisley Park", MessageBoxButton.OK, MessageBoxImage.Error);
-				logger.Error(ex, "Couldn't fetch or save offsets from the server!");
-				return false;
-			}
-
 			// Get offsets.
 			GetOffsets();
 
@@ -625,7 +612,7 @@ private void OnWork(object sender, DoWorkEventArgs e)
 			{
 				// Pointers for player position, start of the actor table (first actor in the table is you)
 				// NOTE: needs to be addressed in the loop because it changes dynamically.
-				var playerPosition = new Pointer(GameProcess, GameDefinitions.ActorTable + 0x8, 0xF0, 0x50);
+				var playerPosition = new Pointer(GameProcess, (ulong)Offsets.ActorTable + 0x8, 0xF0, 0x50);
 
 				// Supporting cancellation.
 				if (Worker.CancellationPending)