Fixed #91, #92 and #93 - HIFI Networking

MBU-Team · Aug 11, 2021 · 6f0afa7 · 6f0afa7
1 parent ccf019e
commit 6f0afa7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/engine/source/core/torqueConfig.h b/engine/source/core/torqueConfig.h
@@ -45,9 +45,6 @@
 /// Define me to enable Torque HiFi support
 #define TORQUE_HIFI_NET
 
-/// Define me for a temporary HiFi fix
-#define TORQUE_HIFI_TEMP_FIX // TODO: Fix properly and remove this
-
 //-----------------------------------------------------------------------------
 // Marble Blast related configuration defines
 

diff --git a/engine/source/game/gameBase.cpp b/engine/source/game/gameBase.cpp
@@ -198,7 +198,7 @@ bool GameBase::onAdd()
         return false;
 
     if (gSPMode)
-        mTypeMask &= ~GameBaseObjectType;
+        mTypeMask &= ~GameBaseHiFiObjectType;
 
     return true;
 }
@@ -482,15 +482,9 @@ TickCacheEntry* GameBase::addTickCacheEntry()
 
 void GameBase::ageTickCache(S32 numToAge, S32 len)
 {
-#ifdef TORQUE_HIFI_TEMP_FIX
-    // TODO: this is not a proper fix for hifi crashes, figure it out later
-    if (!mTickCacheHead || mTickCacheHead->numEntry < numToAge)
-        return;
-#else
     AssertFatal(mTickCacheHead,"No tick cache head");
     AssertFatal(mTickCacheHead->numEntry>=numToAge,"Too few entries!");
     AssertFatal(mTickCacheHead->numEntry>numToAge,"Too few entries!");
-#endif
 
     while (numToAge--)
         dropOldest();

diff --git a/engine/source/game/gameConnection.cpp b/engine/source/game/gameConnection.cpp
@@ -347,10 +347,8 @@ S32 GameConnection::getServerTicks(U32 serverTickNum)
             serverTicks -= MaxTickCount;
         else if (-serverTicks > HalfMaxTickCount)
             serverTicks += MaxTickCount;
-#ifndef TORQUE_HIFI_TEMP_FIX
         // TEMP: This assert keeps getting hit when using preview mode, disabling until we can find out why.
-        AssertFatal(serverTicks >= 0, "Server can't tick backwards!!!");
-#endif
+        //AssertFatal(serverTicks >= 0, "Server can't tick backwards!!!");
         if (serverTicks < 0)
             serverTicks = 0;
     }
@@ -1009,11 +1007,7 @@ void GameConnection::readPacket(BitStream* bstream)
         totalCatchup = mLastClientMove - mFirstMoveIndex;
 
         getCurrentClientProcessList()->ageTickCache(ourTicks + (tickDiff > 0 ? tickDiff : 0), totalCatchup + 1);
-
-#ifndef TORQUE_HIFI_TEMP_FIX
-        // TODO: disabling this is not a proper fix for hifi crashes, figure it out later
         getCurrentClientProcessList()->forceHifiReset(tickDiff != 0);
-#endif
 
         mDamageFlash = 0;
         mWhiteOut = 0;