Merge pull request #127 from MichaelRelaxen/mem-hook-work

Fix some memory hook bugs

Author: MilchRatchet

LibReplanetizer/Level Objects/Gameplay/Moby.cs

@@ -244,9 +244,9 @@ public bool isSpawner
         public Bitmask mode { get; set; } = 0;
 
         // This should probably get removed, not enough information are available to construct a moby like that
-        public Moby()
+        public Moby(GameType game)
         {
-            this.game = GameType.RaC1;
+            this.game = game;
             this.pVars = new byte[0];
             this.mobyID = MAX_ID++;
         }
@@ -852,6 +852,8 @@ public void UpdateRC23(byte[] memory, int offset)
 
                 oClass = ReadUshort(memory, offset + 0xAA);
 
+                UID = ReadUshort(memory, offset + 0xB2);
+
                 transformation = ReadMatrix3x4(memory, offset + 0xC0);
 
                 float rotX = ReadFloat(memory, offset + 0xF0);
@@ -902,6 +904,7 @@ public void UpdateFromMemory(byte[] mobyMemory, int offset, List<Model> models)
             if (memory.IsDead())
             {
                 model = null;
+                modelID = -1;
                 return;
             }
 

Replanetizer/Frames/LevelFrame.cs

@@ -791,7 +791,7 @@ public void Tick(float deltaTime)
 
             if (interactiveSession && hookLiveUpdate && hook != null)
             {
-                hook.UpdateMobys(level.mobs, level.mobyModels, this);
+                hook.UpdateMobys(level.mobs, level.mobyModels, this, level.game);
                 if (hookUpdateCamera)
                 {
                     hook.UpdateCamera(camera);

Replanetizer/MemoryHook/MemoryHookHandle.cs

@@ -121,7 +121,7 @@ public void UpdateCamera(Camera camera)
 #endif
         }
 
-        public void UpdateMobys(List<Moby> levelMobs, List<Model> models, LevelFrame frame)
+        public void UpdateMobys(List<Moby> levelMobs, List<Model> models, LevelFrame frame, GameType game)
         {
 #if _WINDOWS
             if (!hookWorking) return;
@@ -143,7 +143,7 @@ public void UpdateMobys(List<Moby> levelMobs, List<Model> models, LevelFrame fra
 
             while (levelMobs.Count < numMobs)
             {
-                Moby mob = new Moby();
+                Moby mob = new Moby(game);
                 levelMobs.Add(mob);
                 frame.levelRenderer?.Include(mob);
             }