Fix Visual Studio crashes related to nans and uninitialized variables.

Specifically, this fixes a crash when exploding the gas tank in the inner yard in Chapter 5.
rohit-n · Feb 12, 2024 · a8cf3dd · a8cf3dd
1 parent b6a4061
commit a8cf3dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/NOLF2/ClientShellDLL/ClientShellShared/ExplosionFX.cpp b/NOLF2/ClientShellDLL/ClientShellShared/ExplosionFX.cpp
@@ -82,7 +82,7 @@ LTBOOL CExplosionFX::CreateObject(ILTClient *pClientDE)
 
 		// Determine what container we're in...
 
-		ContainerCode eCode;
+		ContainerCode eCode = CC_NO_CONTAINER;
 		HLOCALOBJ objList[1];
         LTVector vTestPos = m_cs.vPos;
         uint32 dwNum = ::GetPointContainers(vTestPos, objList, 1, ::GetLiquidFlags());

diff --git a/NOLF2/ClientShellDLL/ClientShellShared/SFXMgr.cpp b/NOLF2/ClientShellDLL/ClientShellShared/SFXMgr.cpp
@@ -278,6 +278,12 @@ void CSFXMgr::HandleSFXMsg(HLOCALOBJ hObj, ILTMessage_Read *pMsg)
 			debris.vPos			= pMsg->ReadCompPos();
 			debris.nDebrisId	= pMsg->Readuint8();
 
+			if (std::isnan(debris.rRot[0]) || std::isnan(debris.rRot[1]) ||
+				std::isnan(debris.rRot[2]) || std::isnan(debris.rRot[3]))
+			{
+				debris.rRot.Identity();
+			}
+
 			CreateSFX(nId, &debris);
 		}
 		break;