diff options
Diffstat (limited to 'src/d/actor/d_a_obj_window.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_window.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/d/actor/d_a_obj_window.cpp b/src/d/actor/d_a_obj_window.cpp index 7421152697..c15f97e3cf 100644 --- a/src/d/actor/d_a_obj_window.cpp +++ b/src/d/actor/d_a_obj_window.cpp @@ -53,20 +53,25 @@ int daObjWindow_c::Create() { mCyl.Set(l_cyl_src); mCyl.SetStts(&mStts); } - tevStr.mLightInf.r = getLightInf(); + u8 light = getLightInf(); + tevStr.mLightInf.r = light; return 1; } int daObjWindow_c::CreateHeap() { - J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 9); - mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 9); + JUT_ASSERT(251, modelData != NULL); + + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { return 0; } if (l_bck[mType] > 0) { - J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_bck[mType]); + J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_bck[mType]); + JUT_ASSERT(266, pbck != NULL); + mpBckAnm = new mDoExt_bckAnm(); - if (mpBckAnm == NULL || !mpBckAnm->init(anm, 1, 2, 1.0f, 0, -1, false)) { + if (mpBckAnm == NULL || !mpBckAnm->init(pbck, 1, 2, 1.0f, 0, -1, false)) { return 0; } } |