Skip to content

fix(objectcreation): Prevent null drawable crash during object creation #629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(objectcreation): Prevent null drawable crash during object creation #629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,16 +932,20 @@ class GenericObjectCreationNugget : public ObjectCreationNugget

if (!m_nameAreObjects)
{
for (DrawModule** dm = obj->getDrawable()->getDrawModules(); *dm; ++dm)
Drawable* draw = obj->getDrawable();
if (draw)
{
DebrisDrawInterface* di = (*dm)->getDebrisDrawInterface();
if (di)
for (DrawModule** dm = draw->getDrawModules(); *dm; ++dm)
{
di->setModelName(modelName, m_okToChangeModelColor ? obj->getIndicatorColor() : 0, m_shadowType);
if (!m_animSets.empty())
DebrisDrawInterface* di = (*dm)->getDebrisDrawInterface();
if (di)
{
Int which = GameLogicRandomValue(0, m_animSets.size()-1);
di->setAnimNames(m_animSets[which].m_animInitial, m_animSets[which].m_animFlying, m_animSets[which].m_animFinal, m_fxFinal);
di->setModelName(modelName, m_okToChangeModelColor ? obj->getIndicatorColor() : 0, m_shadowType);
if (!m_animSets.empty())
{
Int which = GameLogicRandomValue(0, m_animSets.size()-1);
di->setAnimNames(m_animSets[which].m_animInitial, m_animSets[which].m_animFlying, m_animSets[which].m_animFinal, m_fxFinal);
}
}
}
}
Expand Down Expand Up @@ -1328,15 +1332,17 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
AudioEventRTS fadeAudioEvent(m_fadeSoundName);
fadeAudioEvent.setObjectID(sourceObj->getID());
TheAudio->addAudioEvent(&fadeAudioEvent);
debris->getDrawable()->fadeIn(m_fadeFrames);
if (debris->getDrawable())
debris->getDrawable()->fadeIn(m_fadeFrames);
}

if (m_fadeOut)
{
AudioEventRTS fadeAudioEvent(m_fadeSoundName);
fadeAudioEvent.setObjectID(sourceObj->getID());
TheAudio->addAudioEvent(&fadeAudioEvent);
debris->getDrawable()->fadeOut(m_fadeFrames);
if (debris->getDrawable())
debris->getDrawable()->fadeOut(m_fadeFrames);
}
}

Expand Down
Loading