d_menu_map_common OK (#2075)

src/d/meter/d_meter_HIO.cpp

@@ -1226,90 +1226,90 @@ dMeter_ringHIO_c::dMeter_ringHIO_c() {
 dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() {
     mPortalCursorScale = 0.5f;
     mPortalIconScale = 0.65f;
-    mDestinationScale = 0.5f;
-    mDestinationZoomScale = 0.8f;
-    mLinkScale = 0.5f;
-    mLinkZoomScale = 0.6f;
-    mYetoScale = 0.3f;
-    mYetoZoomScale = 1.2f;
-    mYetaScale = 0.3f;
-    mYetaZoomScale = 1.2f;
-    mGoldWolfScale = 0.2f;
-    mGoldWolfZoomScale = 1.28f;
-    field_0xa0 = 0.2f;
-    field_0xa8 = 1.6f;
-    field_0xb0 = 0.2f;
-    field_0xb8 = 1.6f;
-    field_0xc0 = 0.2f;
-    field_0xc8 = 1.6f;
-    field_0xd0 = 0.2f;
-    field_0xd8 = 1.6f;
-    mWagonScale = 0.2f;
-    mWagonZoomScale = 1.0f;
-    field_0x60 = 0.2f;
-    field_0x68 = 1.6f;
-    field_0x50 = 0.2f;
-    field_0x58 = 1.4f;
-    mDungeonEntranceScale = 0.4f;
-    mDungeonEntranceZoomScale = 0.6f;
-    field_0x20 = 0.2f;
-    field_0x28 = 1.6f;
-    field_0x30 = 0.2f;
-    field_0x38 = 1.6f;
-    mRoomEntranceScale = 0.5f;
-    mRoomEntranceZoomScale = 0.6f;
-    mLV8EntranceScale = 0.5f;
-    mLV8EntranceZoomScale = 0.6f;
-    field_0x120 = 0.2f;
-    field_0x128 = 1.6f;
-    mLightDropScale = 0.25f;
-    mLightDropZoomScale = 0.55f;
-    field_0x140 = 0.2f;
-    field_0x148 = 1.6f;
-    field_0x150 = 0.2f;
-    field_0x158 = 1.6f;
-    mDungeonDestScale = 0.5f;
-    mDungeonDestZoomScale = 0.8f;
-    mDungeonLinkScale = 0.4f;
-    mDungeonLinkZoomScale = 0.5f;
-    field_0x74 = 0.2f;
-    field_0x7c = 0.8f;
-    field_0x84 = 0.2f;
-    field_0x8c = 0.8f;
-    field_0x94 = 0.2f;
-    field_0x9c = 0.8f;
-    mMonkeyScale = 0.2f;
-    mMonkeyZoomScale = 0.8f;
-    mOoccooScale = 0.2f;
-    mOoccooZoomScale = 0.8f;
-    mOoccooPotScale = 0.2f;
-    mOoccooPotZoomScale = 0.8f;
-    mCopyRodStatueScale = 0.2f;
-    mCopyRodStatueZoomScale = 0.8f;
-    field_0xe4 = 0.2f;
-    field_0xec = 0.5f;
-    mChestScale = 0.2f;
-    mChestZoomScale = 0.8f;
-    mSmallKeyScale = 0.2f;
-    mSmallKeyZoomScale = 0.7f;
-    mDungeonExitScale = 0.3f;
-    mDungeonExitZoomScale = 0.6f;
-    mBossScale = 0.2f;
-    mBossZoomScale = 0.8f;
-    mGanonScale = 0.2f;
-    mGanonZoomScale = 0.8f;
-    mDungeonSpawnScale = 0.4f;
-    mDungeonSpawnZoomScale = 0.5f;
-    field_0x114 = 0.4f;
-    field_0x11c = 0.5f;
-    mDungeonWarpScale = 0.2f;
-    mDungeonWarpZoomScale = 0.8f;
-    field_0x134 = 0.25f;
-    field_0x13c = 0.3f;
-    mLightOrbScale = 0.2f;
-    mLightOrbZoomScale = 0.8f;
-    mCannonBallScale = 0.2f;
-    mCannonBallZoomScale = 0.8f;
+    mDestinationScale[0] = 0.5f;
+    mDestinationZoomScale[0] = 0.8f;
+    mLinkScale[0] = 0.5f;
+    mLinkZoomScale[0] = 0.6f;
+    mYetoScale[0] = 0.3f;
+    mYetoZoomScale[0] = 1.2f;
+    mYetaScale[0] = 0.3f;
+    mYetaZoomScale[0] = 1.2f;
+    mGoldWolfScale[0] = 0.2f;
+    mGoldWolfZoomScale[0] = 1.28f;
+    mMonkeyScale[0] = 0.2f;
+    mMonkeyZoomScale[0] = 1.6f;
+    mOoccooScale[0] = 0.2f;
+    mOoccooZoomScale[0] = 1.6f;
+    mOoccooPotScale[0] = 0.2f;
+    mOoccooPotZoomScale[0] = 1.6f;
+    mCopyRodStatueScale[0] = 0.2f;
+    mCopyRodStatueZoomScale[0] = 1.6f;
+    mWagonScale[0] = 0.2f;
+    mWagonZoomScale[0] = 1.0f;
+    mChestScale[0] = 0.2f;
+    mChestZoomScale[0] = 1.6f;
+    mSmallKeyScale[0] = 0.2f;
+    mSmallKeyZoomScale[0] = 1.4f;
+    mDungeonEntranceScale[0] = 0.4f;
+    mDungeonEntranceZoomScale[0] = 0.6f;
+    mBossScale[0] = 0.2f;
+    mBossZoomScale[0] = 1.6f;
+    mGanonScale[0] = 0.2f;
+    mGanonZoomScale[0] = 1.6f;
+    mRoomEntranceScale[0] = 0.5f;
+    mRoomEntranceZoomScale[0] = 0.6f;
+    mLV8EntranceScale[0] = 0.5f;
+    mLV8EntranceZoomScale[0] = 0.6f;
+    mDungeonWarpScale[0] = 0.2f;
+    mDungeonWarpZoomScale[0] = 1.6f;
+    mLightDropScale[0] = 0.25f;
+    mLightDropZoomScale[0] = 0.55f;
+    mLightOrbScale[0] = 0.2f;
+    mLightOrbZoomScale[0] = 1.6f;
+    mCannonBallScale[0] = 0.2f;
+    mCannonBallZoomScale[0] = 1.6f;
+    mDestinationScale[1] = 0.5f;
+    mDestinationZoomScale[1] = 0.8f;
+    mLinkScale[1] = 0.4f;
+    mLinkZoomScale[1] = 0.5f;
+    mYetoScale[1] = 0.2f;
+    mYetoZoomScale[1] = 0.8f;
+    mYetaScale[1] = 0.2f;
+    mYetaZoomScale[1] = 0.8f;
+    mGoldWolfScale[1] = 0.2f;
+    mGoldWolfZoomScale[1] = 0.8f;
+    mMonkeyScale[1] = 0.2f;
+    mMonkeyZoomScale[1] = 0.8f;
+    mOoccooScale[1] = 0.2f;
+    mOoccooZoomScale[1] = 0.8f;
+    mOoccooPotScale[1] = 0.2f;
+    mOoccooPotZoomScale[1] = 0.8f;
+    mCopyRodStatueScale[1] = 0.2f;
+    mCopyRodStatueZoomScale[1] = 0.8f;
+    mWagonScale[1] = 0.2f;
+    mWagonZoomScale[1] = 0.5f;
+    mChestScale[1] = 0.2f;
+    mChestZoomScale[1] = 0.8f;
+    mSmallKeyScale[1] = 0.2f;
+    mSmallKeyZoomScale[1] = 0.7f;
+    mDungeonEntranceScale[1] = 0.3f;
+    mDungeonEntranceZoomScale[1] = 0.6f;
+    mBossScale[1] = 0.2f;
+    mBossZoomScale[1] = 0.8f;
+    mGanonScale[1] = 0.2f;
+    mGanonZoomScale[1] = 0.8f;
+    mRoomEntranceScale[1] = 0.4f;
+    mRoomEntranceZoomScale[1] = 0.5f;
+    mLV8EntranceScale[1] = 0.4f;
+    mLV8EntranceZoomScale[1] = 0.5f;
+    mDungeonWarpScale[1] = 0.2f;
+    mDungeonWarpZoomScale[1] = 0.8f;
+    mLightDropScale[1] = 0.25f;
+    mLightDropZoomScale[1] = 0.3f;
+    mLightOrbScale[1] = 0.2f;
+    mLightOrbZoomScale[1] = 0.8f;
+    mCannonBallScale[1] = 0.2f;
+    mCannonBallZoomScale[1] = 0.8f;
 
     mLV5DungeonItemDebug = false;
     mLV5DungeonItem = NO_ITEM;
@@ -1319,14 +1319,14 @@ dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() {
         mIconDisplay[i] = true;
     }
 
-    mLightDropFlashStartScaleOut = 1.2f;
-    mLightDropFlashEndScaleOut = 1.5f;
-    mLightDropFlashStartAlphaOut = 255;
-    mLightDropFlashEndAlphaOut = 255;
-    mLightDropFlashStartScaleIn = 1.0f;
-    mLightDropFlashEndScaleIn = 1.3f;
-    mLightDropFlashStartAlphaIn = 255;
-    mLightDropFlashEndAlphaIn = 255;
+    mLightDropFlashStartScaleOut[0] = 1.2f;
+    mLightDropFlashEndScaleOut[0] = 1.5f;
+    mLightDropFlashStartAlphaOut[0] = 255;
+    mLightDropFlashEndAlphaOut[0] = 255;
+    mLightDropFlashStartScaleOut[1] = 1.0f;
+    mLightDropFlashEndScaleOut[1] = 1.3f;
+    mLightDropFlashStartAlphaOut[1] = 255;
+    mLightDropFlashEndAlphaOut[1] = 255;
     mLightDropFlashFrameNum = 10;
 }