diff --git a/Generals/Code/GameEngine/Include/GameClient/Shadow.h b/Generals/Code/GameEngine/Include/GameClient/Shadow.h index 2e40ea7ae3a..cacf40256a8 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Shadow.h +++ b/Generals/Code/GameEngine/Include/GameClient/Shadow.h @@ -73,6 +73,18 @@ class Shadow struct ShadowTypeInfo { + ShadowTypeInfo() + { + m_ShadowName[0] = '\0'; + m_type = SHADOW_NONE; + allowUpdates = false; + allowWorldAlign = false; + m_sizeX = 0.0f; + m_sizeY = 0.0f; + m_offsetX = 0.0f; + m_offsetY = 0.0f; + } + char m_ShadowName[64]; //when set, overrides the default model shadow (used mostly for Decals). ShadowType m_type; //type of shadow Bool allowUpdates; //whether to update the shadow image when object/light moves. diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp index f7b57d4fa4c..b482f1b7242 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp @@ -129,8 +129,6 @@ void W3DDebrisDraw::setModelName(AsciiString name, Color color, ShadowType t) { Shadow::ShadowTypeInfo shadowInfo; shadowInfo.m_type = t; - shadowInfo.m_sizeX=0; - shadowInfo.m_sizeY=0; m_shadow = TheW3DShadowManager->addShadow(m_renderObject, &shadowInfo); } else diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp index e199b6b0500..8ccfd627426 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp @@ -62,10 +62,6 @@ W3DDefaultDraw::W3DDefaultDraw(Thing *thing, const ModuleData* moduleData) : Dra Shadow::ShadowTypeInfo shadowInfo; shadowInfo.m_type=(ShadowType)SHADOW_VOLUME; - shadowInfo.m_sizeX=0; //use defaults - shadowInfo.m_sizeY=0; - shadowInfo.m_offsetX=0; - shadowInfo.m_offsetY=0; m_shadow = TheW3DShadowManager->addShadow(m_renderObject, &shadowInfo); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h index 01e02d09dbe..c139e4b5d90 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h @@ -73,6 +73,18 @@ class Shadow struct ShadowTypeInfo { + ShadowTypeInfo() + { + m_ShadowName[0] = '\0'; + m_type = SHADOW_NONE; + allowUpdates = false; + allowWorldAlign = false; + m_sizeX = 0.0f; + m_sizeY = 0.0f; + m_offsetX = 0.0f; + m_offsetY = 0.0f; + } + char m_ShadowName[64]; //when set, overrides the default model shadow (used mostly for Decals). ShadowType m_type; //type of shadow Bool allowUpdates; //whether to update the shadow image when object/light moves. diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp index bf641e4407b..9396241c850 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp @@ -129,8 +129,6 @@ void W3DDebrisDraw::setModelName(AsciiString name, Color color, ShadowType t) { Shadow::ShadowTypeInfo shadowInfo; shadowInfo.m_type = t; - shadowInfo.m_sizeX=0; - shadowInfo.m_sizeY=0; m_shadow = TheW3DShadowManager->addShadow(m_renderObject, &shadowInfo); } else diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp index c6b30a4fdf5..d0746201ca7 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp @@ -62,10 +62,6 @@ W3DDefaultDraw::W3DDefaultDraw(Thing *thing, const ModuleData* moduleData) : Dra Shadow::ShadowTypeInfo shadowInfo; shadowInfo.m_type=(ShadowType)SHADOW_VOLUME; - shadowInfo.m_sizeX=0; //use defaults - shadowInfo.m_sizeY=0; - shadowInfo.m_offsetX=0; - shadowInfo.m_offsetY=0; m_shadow = TheW3DShadowManager->addShadow(m_renderObject, &shadowInfo);