Fix incorrect npc's memory loading.

OpenXRay · Aug 14, 2017 · f97093b · f97093b
1 parent 3ba633f
commit f97093b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/xrGame/hit_memory_manager.cpp b/src/xrGame/hit_memory_manager.cpp
@@ -331,17 +331,17 @@ void CHitMemoryManager::load(IReader& packet)
 #ifdef USE_LEVEL_TIME
         VERIFY(Device.dwTimeGlobal >= object.m_level_time);
         object.m_level_time = packet.r_u32();
-        object.m_level_time += Device.dwTimeGlobal;
+        object.m_level_time = Device.dwTimeGlobal - object.m_level_time;
 #endif // USE_LEVEL_TIME
 #ifdef USE_LAST_LEVEL_TIME
         VERIFY(Device.dwTimeGlobal >= object.m_last_level_time);
         object.m_last_level_time = packet.r_u32();
-        object.m_last_level_time += Device.dwTimeGlobal;
+        object.m_last_level_time = Device.dwTimeGlobal - object.m_last_level_time;
 #endif // USE_LAST_LEVEL_TIME
 #ifdef USE_FIRST_LEVEL_TIME
         VERIFY(Device.dwTimeGlobal >= (*I).m_first_level_time);
         object.m_first_level_time = packet.r_u32();
-        object.m_first_level_time += Device.dwTimeGlobal;
+        object.m_first_level_time = Device.dwTimeGlobal - object.m_first_level_time;
 #endif // USE_FIRST_LEVEL_TIME
         packet.r_fvector3(object.m_direction);
         object.m_bone_index = packet.r_u16();

diff --git a/src/xrGame/sound_memory_manager.cpp b/src/xrGame/sound_memory_manager.cpp
@@ -454,17 +454,17 @@ void CSoundMemoryManager::load(IReader& packet)
 #ifdef USE_LEVEL_TIME
         VERIFY(Device.dwTimeGlobal >= object.m_level_time);
         object.m_level_time = packet.r_u32();
-        object.m_level_time += Device.dwTimeGlobal;
+        object.m_level_time = Device.dwTimeGlobal - object.m_level_time;
 #endif // USE_LEVEL_TIME
 #ifdef USE_LAST_LEVEL_TIME
         VERIFY(Device.dwTimeGlobal >= object.m_last_level_time);
         object.m_last_level_time = packet.r_u32();
-        object.m_last_level_time += Device.dwTimeGlobal;
+        object.m_last_level_time = Device.dwTimeGlobal - object.m_last_level_time;
 #endif // USE_LAST_LEVEL_TIME
 #ifdef USE_FIRST_LEVEL_TIME
         VERIFY(Device.dwTimeGlobal >= (*I).m_first_level_time);
         object.m_first_level_time = packet.r_u32();
-        object.m_first_level_time += Device.dwTimeGlobal;
+        object.m_first_level_time = Device.dwTimeGlobal - object.m_first_level_time;
 #endif // USE_FIRST_LEVEL_TIME
         object.m_sound_type = (ESoundTypes)packet.r_u32();
         object.m_power = packet.r_float();

diff --git a/src/xrGame/visual_memory_manager.cpp b/src/xrGame/visual_memory_manager.cpp
@@ -833,17 +833,17 @@ void CVisualMemoryManager::load(IReader& packet)
 #ifdef USE_LEVEL_TIME
         VERIFY(Device.dwTimeGlobal >= object.m_level_time);
         object.m_level_time = packet.r_u32();
-        object.m_level_time += Device.dwTimeGlobal;
+        object.m_level_time = Device.dwTimeGlobal - object.m_level_time;
 #endif // USE_LEVEL_TIME
 #ifdef USE_LAST_LEVEL_TIME
         VERIFY(Device.dwTimeGlobal >= object.m_last_level_time);
         object.m_last_level_time = packet.r_u32();
-        object.m_last_level_time += Device.dwTimeGlobal;
+        object.m_last_level_time = Device.dwTimeGlobal - object.m_last_level_time;
 #endif // USE_LAST_LEVEL_TIME
 #ifdef USE_FIRST_LEVEL_TIME
         VERIFY(Device.dwTimeGlobal >= (*I).m_first_level_time);
         object.m_first_level_time = packet.r_u32();
-        object.m_first_level_time += Device.dwTimeGlobal;
+        object.m_first_level_time = Device.dwTimeGlobal - object.m_first_level_time;
 #endif // USE_FIRST_LEVEL_TIME
         object.m_visible.assign(packet.r_u64());