swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-09-28 15:12:53 -04:00
Code Issues Projects Releases Wiki Activity

more null checks in places where we're calling createAppearance; some cleanup

Browse Source
This commit is contained in:
DarthArgus
2016-01-07 22:05:32 -06:00
parent 1ad5f8d882
commit 1d67bdd186
7 changed files with 95 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedCollision/src/shared/core/DoorObject.cpp
+17 -3
View File
@@ -208,7 +208,11 @@ void DoorObject::createAppearance ( DoorInfo const & info )
{
if (info.m_frameAppearance && info.m_frameAppearance[0])
{
setAppearance(AppearanceTemplateList::createAppearance(info.m_frameAppearance));
Appearance * const appearance = AppearanceTemplateList::createAppearance(info.m_frameAppearance);
if (appearance != NULL) {
setAppearance(appearance);
}
}
m_drawnDoor[0] = new Object();
@@ -239,14 +243,24 @@ void DoorObject::createAppearance ( DoorInfo const & info )
{
if (info.m_doorAppearance && info.m_doorAppearance[0])
{
m_drawnDoor[0]->setAppearance(AppearanceTemplateList::createAppearance(info.m_doorAppearance));
Appearance * const appearance = AppearanceTemplateList::createAppearance(info.m_doorAppearance);
if (appearance != NULL) {
m_drawnDoor[0]->setAppearance(appearance);
}
}
if (info.m_doorAppearance2 && info.m_doorAppearance2[0])
{
m_drawnDoor[1] = new Object();
m_drawnDoor[1]->attachToObject_p(this,true);
m_drawnDoor[1]->setAppearance(AppearanceTemplateList::createAppearance(info.m_doorAppearance2));
Appearance * const appearance = AppearanceTemplateList::createAppearance(info.m_doorAppearance2);
if (appearance != NULL) {
m_drawnDoor[1]->setAppearance(appearance);
}
if (info.m_doorFlip2)
m_drawnDoor[1]->yaw_o(PI);
}