diff options
| author | roeming <brother64youyou@gmail.com> | 2025-12-07 20:09:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-07 17:09:47 -0800 |
| commit | 07a4e6b05289b7efcd37f9c69afb8336c0171aa0 (patch) | |
| tree | bfe2a1297687b67d6539eb5102d8af992b591369 /include/d/d_menu_fmap2D.h | |
| parent | e82c27fd001994abdd894f94d62b7e628b446c8e (diff) | |
match debug for D_menu_fmap2_d (#2925)
* menu_fmap2d debug progress
* match debug for d_menu_fmap2D
* fix broken function
* fix weird shield mismatch
* fix other shield mismatch
* fix suggestions
* fix func for wii version
* match func for all versions
* remove cast from saveBitLabels
Diffstat (limited to 'include/d/d_menu_fmap2D.h')
| -rw-r--r-- | include/d/d_menu_fmap2D.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/d/d_menu_fmap2D.h b/include/d/d_menu_fmap2D.h index 75752c8ccc..cda275f36f 100644 --- a/include/d/d_menu_fmap2D.h +++ b/include/d/d_menu_fmap2D.h @@ -14,7 +14,9 @@ class dMsgScrnExplain_c; class dMenu_Fmap2DBack_c : public dDlst_base_c, public dMenuMapCommon_c { public: dMenu_Fmap2DBack_c(); + void setRegionTexData(u8, ResTIMG*, f32, f32, f32, f32, f32, f32, f32, f32, f32); + void setRegionTexData(u8, f32, f32, f32, f32, f32, f32, f32, f32, f32); void calcAllMapPos(); f32 calcAllMapScaleRate(); void calcAllMapPos2DFirst(f32, f32, f32*, f32*); @@ -142,8 +144,8 @@ public: u8 getSpotCursor() { return mSpotCursor; } u8 getSelectRegion() { return mSelectRegion; } bool getAllPathShowFlag() { return mAllPathShowFlag; } - f32 getRegionOriginX(u8 i_region) { return mRegionOriginX[i_region]; } - f32 getRegionOriginZ(u8 i_region) { return mRegionOriginZ[i_region]; } + f32 getRegionOriginX(int i_region) { return mRegionOriginX[i_region]; } + f32 getRegionOriginZ(int i_region) { return mRegionOriginZ[i_region]; } void setArrowAlpha(f32 i_alpha) { mArrowAlpha = i_alpha; } void setSpotTextureFadeAlpha(f32 i_alpha) { mSpotTextureFadeAlpha = i_alpha; } @@ -155,8 +157,8 @@ public: void onArrowDrawFlag() { mArrowDrawFlag = true; } bool isArrowDrawFlag() { return mArrowDrawFlag; } - void onShowRegionFlag(int region_bit) { mRegionFlag |= ((1 << region_bit) & 0xFF); } - bool isShowRegionFlag(int region_bit) { return mRegionFlag & ((1 << region_bit) & 0xFF); } + void onShowRegionFlag(int region_bit) { mRegionFlag |= (u8)(1 << region_bit); } + BOOL isShowRegionFlag(int region_bit) { return mRegionFlag & (u8)(1 << region_bit) ? TRUE : FALSE; } void mapBlink() {} |