diff --git a/include/d/actor/d_a_balloon_2D.h b/include/d/actor/d_a_balloon_2D.h index f2dfa5e99f..193ecadbaa 100644 --- a/include/d/actor/d_a_balloon_2D.h +++ b/include/d/actor/d_a_balloon_2D.h @@ -44,6 +44,9 @@ public: int draw(); int execute(); void drawMeter(); + #if TARGET_PC + void updateOnWide(); + #endif void setComboCount(u8, u8); void setScoreCount(u32); void addScoreCount(cXyz*, u32, u8); diff --git a/src/d/actor/d_a_balloon_2D.cpp b/src/d/actor/d_a_balloon_2D.cpp index 957e7df281..6d9c66b464 100644 --- a/src/d/actor/d_a_balloon_2D.cpp +++ b/src/d/actor/d_a_balloon_2D.cpp @@ -268,6 +268,11 @@ int daBalloon2D_c::draw() { int daBalloon2D_c::execute() { setAllAlpha(); setComboAlpha(); + + #if TARGET_PC + updateOnWide(); + #endif + setHIO(false); return 1; } @@ -278,6 +283,15 @@ void daBalloon2D_c::drawMeter() { drawAddScore(); } +#if TARGET_PC +void daBalloon2D_c::updateOnWide() { + // Combo HUD + l_HOSTIO = {}; + + l_HOSTIO.m.m2DNumberCombo2PosX = mDoGph_gInf_c::ScaleHUDXRight(l_HOSTIO.m.m2DNumberCombo2PosX); + l_HOSTIO.m.mAdjustmentToggle = 1; +} +#endif void daBalloon2D_c::setComboCount(u8 size, u8 comboNum) { if (mComboNum != comboNum) { diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp index 0566494863..2df28b2655 100644 --- a/src/d/d_meter_HIO.cpp +++ b/src/d/d_meter_HIO.cpp @@ -2289,7 +2289,8 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { #if WIDESCREEN_SUPPORT void dMeter_drawHIO_c::updateOnWide() { #if TARGET_PC - g_drawHIO = {}; // this might be a bad idea + // Main HUD + g_drawHIO = {}; g_drawHIO.mMainHUDButtonsPosX = mDoGph_gInf_c::ScaleHUDXRight(g_drawHIO.mMainHUDButtonsPosX); g_drawHIO.mRingHUDButtonsPosX = mDoGph_gInf_c::ScaleHUDXRight(g_drawHIO.mRingHUDButtonsPosX); @@ -2301,6 +2302,10 @@ void dMeter_drawHIO_c::updateOnWide() { g_drawHIO.mButtonCrossONPosX = mDoGph_gInf_c::ScaleHUDXLeft(g_drawHIO.mButtonCrossONPosX); g_drawHIO.mLifeGaugePosX = mDoGph_gInf_c::ScaleHUDXLeft(g_drawHIO.mLifeGaugePosX); g_drawHIO.mLanternMeterPosX = mDoGph_gInf_c::ScaleHUDXLeft(g_drawHIO.mLanternMeterPosX); + + // River Canoe Minigame + g_drawHIO.mMiniGame.mCounterPosX[1] = mDoGph_gInf_c::ScaleHUDXRight(g_drawHIO.mMiniGame.mCounterPosX[1]); + g_drawHIO.mMiniGame.mIconPosX[1] = mDoGph_gInf_c::ScaleHUDXRight(g_drawHIO.mMiniGame.mIconPosX[1]); #endif }