From 98bc111de6586b187adcd7936b603bbb6839fc70 Mon Sep 17 00:00:00 2001
From: "seer-by-sentry[bot]"
 <157164994+seer-by-sentry[bot]@users.noreply.github.com>
Date: Wed, 31 Dec 2025 04:23:45 +0000
Subject: [PATCH] Fix: Add null check for m_curState in W3DModelDraw

---
 .../Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp  | 2 +-
 .../Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
index aab8c0ebf9a..3332dd85a3f 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
@@ -1989,7 +1989,7 @@ void W3DModelDraw::adjustTransformMtx(Matrix3D& mtx) const
 	}
 #endif
 
-	if (m_curState->m_flags & (1<<ADJUST_HEIGHT_BY_CONSTRUCTION_PERCENT))
+	if (m_curState && (m_curState->m_flags & (1<<ADJUST_HEIGHT_BY_CONSTRUCTION_PERCENT)))
 	{
 		const Object *obj = getDrawable()->getObject();
 		if (obj)
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
index fccd5c32e02..69682943089 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
@@ -2024,7 +2024,7 @@ void W3DModelDraw::adjustTransformMtx(Matrix3D& mtx) const
 	}
 #endif
 
-	if (m_curState->m_flags & (1<<ADJUST_HEIGHT_BY_CONSTRUCTION_PERCENT))
+	if (m_curState && (m_curState->m_flags & (1<<ADJUST_HEIGHT_BY_CONSTRUCTION_PERCENT)))
 	{
 		const Object *obj = getDrawable()->getObject();
 		if (obj)