diff options
| author | Carco_21 <144170194+carter-ktb21@users.noreply.github.com> | 2025-12-20 21:06:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-20 18:06:17 -0800 |
| commit | c434c2edde34aaa21e8e186b880c3801f969d14a (patch) | |
| tree | af1c6f72e54edec6e688e869d258c03bb23aed0e /src/d/d_msg_object.cpp | |
| parent | a1c691ec92eac461d558e22ec46c1822ebb3d75b (diff) | |
Various d_ work (#2968)
* map work
* various meter work
* d_meter_button ShieldD almost equivalent
* error fix
Diffstat (limited to 'src/d/d_msg_object.cpp')
| -rw-r--r-- | src/d/d_msg_object.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 5f2e2d6fa5..9f078e0065 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -1323,7 +1323,7 @@ void dMsgObject_c::talkStartInit() { (((dComIfGp_isHeapLockFlag() == 2 || (dComIfGp_isHeapLockFlag() == 3 || dComIfGp_isHeapLockFlag() == 1)) && field_0x4cd == 0 && mpTalkHeap != NULL))) && - (mpScrnDraw == NULL && dMeter2Info_getFloatingMessageID() != 0x13eb)) + (mpScrnDraw == NULL && (u32)dMeter2Info_getFloatingMessageID() != 0x13eb)) { if (!bVar1 && ((dComIfGp_isHeapLockFlag() == 0 || dComIfGp_isHeapLockFlag() == 5))) { dComIfGp_setHeapLockFlag(7); @@ -1743,8 +1743,8 @@ bool dMsgObject_c::getStringLocal(u32 param_1, J2DTextBox* param_2, J2DTextBox* return false; } -u8 dMsgObject_c::isGetItemMessage() { - return mFukiKind == 9; +bool dMsgObject_c::isGetItemMessage() { + return (u8)(mFukiKind == 9); } bool dMsgObject_c::isKanbanMessage() { |