Merge pull request #188 from 1rgs/fix/skybox-null-guard

Fix segfault in WaterRenderObjClass when skybox asset fails to load

Author: fbraz3

Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp

@@ -1338,6 +1338,13 @@ void WaterRenderObjClass::update()
 //-------------------------------------------------------------------------------------------------
 void WaterRenderObjClass::replaceSkyboxTexture(const AsciiString& oldTexName, const AsciiString& newTextName)
 {
+	// GeneralsX @bugfix Claude 05/07/2026 Guard against null m_skyBox: replaceAssetTexture dereferences the
+	// render object unconditionally, so skip texture replacement when the skybox asset never loaded.
+	if (m_skyBox == nullptr)
+	{
+		return;
+	}
+
 	W3DAssetManager* assetManager = ((W3DAssetManager*)W3DAssetManager::Get_Instance());
 
 	assetManager->replacePrototypeTexture(m_skyBox, oldTexName.str(), newTextName.str());
@@ -1737,7 +1744,9 @@ void WaterRenderObjClass::Render(RenderInfoClass & rinfo)
 			break;
 	}
 
-	if (TheGlobalData && TheGlobalData->m_drawSkyBox)
+	// GeneralsX @bugfix Claude 05/07/2026 Guard against null m_skyBox: Create_Render_Obj("new_skybox") can fail
+	// when the skybox asset is unavailable (e.g. base Generals archives not found), causing a segfault here.
+	if (TheGlobalData && TheGlobalData->m_drawSkyBox && m_skyBox)
 	{	//center skybox around camera
 		Vector3 pos=rinfo.Camera.Get_Position();
 		pos.Z = TheGlobalData->m_skyBoxPositionZ;

Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp

@@ -1321,6 +1321,11 @@ void TextureLoadTaskClass::Apply_Missing_Texture()
 		return;
 	}
 
+#ifndef _WIN32
+	// DIAG: log which textures fall back to the magenta placeholder
+	fprintf(stderr, "[TEX_MISSING] '%s'\n", static_cast<const char*>(Texture->Get_Full_Path()));
+#endif
+
 	D3DTexture = MissingTexture::_Get_Missing_Texture();
 	if (D3DTexture == nullptr)
 	{