diff options
Diffstat (limited to 'src/d/d_timer.cpp')
| -rw-r--r-- | src/d/d_timer.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 1182b2c317..abe62d594f 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -34,7 +34,7 @@ int dTimer_c::_create() { } dRes_info_c* resInfo = dComIfG_getObjectResInfo("Timer"); - JUT_ASSERT(resInfo != 0); + JUT_ASSERT(0, resInfo != 0); dComIfGp_setAllMapArchive(resInfo->getArchive()); mp_heap = fopMsgM_createExpHeap(0x11000, NULL); @@ -43,7 +43,7 @@ int dTimer_c::_create() { mp_heap->getTotalFreeSize(); mp_tm_scrn = new dDlst_TimerScrnDraw_c(); - JUT_ASSERT(mp_tm_scrn != 0); + JUT_ASSERT(0, mp_tm_scrn != 0); if (appen->timer_mode == 10) { mp_tm_scrn->setScreen(dComIfG_getTimerMode(), resInfo->getArchive()); @@ -612,10 +612,10 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) { setShowType(3); mpGetInScreen = new J2DScreen(); - JUT_ASSERT(mpGetInScreen != 0); + JUT_ASSERT(0, mpGetInScreen != 0); bool fg = mpGetInScreen->setPriority("zelda_game_image_cow_get_in.blo", 0x20000, mpArchive); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpGetInScreen); OSInitFastCast(); @@ -623,13 +623,13 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) { JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpArchive)); mpGetInParent = new CPaneMgr(mpGetInScreen, 'get_in_n', 2, NULL); - JUT_ASSERT(mpGetInParent != 0); + JUT_ASSERT(0, mpGetInParent != 0); mpGetInRoot = new CPaneMgr(mpGetInScreen, 'n_all', 0, NULL); - JUT_ASSERT(mpGetInRoot != 0); + JUT_ASSERT(0, mpGetInRoot != 0); mpGetInText = new CPaneMgr(mpGetInScreen, 'get_in', 0, NULL); - JUT_ASSERT(mpGetInText != 0); + JUT_ASSERT(0, mpGetInText != 0); static_cast<J2DTextBox*>(mpGetInScreen->search('get_in_s'))->setFont(mDoExt_getMesgFont()); static_cast<J2DTextBox*>(mpGetInScreen->search('get_in'))->setFont(mDoExt_getMesgFont()); @@ -652,24 +652,24 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) { /* 8025E240-8025E66C 258B80 042C+00 1/1 0/0 0/0 .text setScreenBase__21dDlst_TimerScrnDraw_cFv */ void dDlst_TimerScrnDraw_c::setScreenBase() { mpScreen = new J2DScreen(); - JUT_ASSERT(mpScreen != 0); + JUT_ASSERT(0, mpScreen != 0); bool fg = mpScreen->setPriority("zelda_game_image_cow_game.blo", 0x20000, mpArchive); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); mpParent = NULL; mpCowParent = new CPaneMgr(mpScreen, 'cow_n', 2, NULL); - JUT_ASSERT(mpCowParent != 0); + JUT_ASSERT(0, mpCowParent != 0); mpCowParent->setAlphaRate(0.0f); mpTimeParent = new CPaneMgr(mpScreen, 'time_n', 2, NULL); - JUT_ASSERT(mpTimeParent != 0); + JUT_ASSERT(0, mpTimeParent != 0); mpTimeParent->setAlphaRate(0.0f); mpImageParent = new CPaneMgr(mpScreen, 'cow_i_n', 2, NULL); - JUT_ASSERT(mpImageParent != 0); + JUT_ASSERT(0, mpImageParent != 0); mpImageParent->setAlphaRate(0.0f); field_0x5c[0][0] = mpScreen->search('c_n_2'); @@ -700,23 +700,23 @@ void dDlst_TimerScrnDraw_c::setScreenBase() { */ void dDlst_TimerScrnDraw_c::setScreenBoatRace() { mpScreen = new J2DScreen(); - JUT_ASSERT(mpScreen != 0); + JUT_ASSERT(0, mpScreen != 0); bool fg = mpScreen->setPriority("zelda_game_image_zora_kawakudari.blo", 0x20000, mpArchive); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); mpParent = new CPaneMgr(mpScreen, 'ta_co_n', 2, NULL); - JUT_ASSERT(mpParent != 0); + JUT_ASSERT(0, mpParent != 0); mpCowParent = new CPaneMgr(mpScreen, 'num_n', 2, NULL); - JUT_ASSERT(mpCowParent != 0); + JUT_ASSERT(0, mpCowParent != 0); mpCowParent->setAlphaRate(0.0f); mpTimeParent = NULL; mpImageParent = new CPaneMgr(mpScreen, 'target_n', 2, NULL); - JUT_ASSERT(mpImageParent != 0); + JUT_ASSERT(0, mpImageParent != 0); mpImageParent->setAlphaRate(0.0f); mpScreen->search('w_target')->hide(); @@ -743,22 +743,22 @@ void dDlst_TimerScrnDraw_c::setScreenBoatRace() { /* 8025E8B8-8025EB20 2591F8 0268+00 1/1 0/0 0/0 .text setScreenRider__21dDlst_TimerScrnDraw_cFv */ void dDlst_TimerScrnDraw_c::setScreenRider() { mpScreen = new J2DScreen(); - JUT_ASSERT(mpScreen != 0); + JUT_ASSERT(0, mpScreen != 0); bool fg = mpScreen->setPriority("zelda_game_image_rider.blo", 0x20000, mpArchive); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); mpParent = NULL; mpCowParent = new CPaneMgr(mpScreen, 'num_n', 2, NULL); - JUT_ASSERT(mpCowParent != 0); + JUT_ASSERT(0, mpCowParent != 0); mpCowParent->setAlphaRate(0.0f); mpTimeParent = NULL; mpImageParent = new CPaneMgr(mpScreen, 'rid_i_n', 2, NULL); - JUT_ASSERT(mpImageParent != 0); + JUT_ASSERT(0, mpImageParent != 0); mpImageParent->setAlphaRate(0.0f); field_0x5c[0][0] = mpScreen->search('n_n_2'); @@ -1684,4 +1684,4 @@ extern msg_process_profile_definition g_profile_TIMER = { &g_fopMsg_Method, 768, &l_dTimer_Method, -};
\ No newline at end of file +}; |
