From e0b1fe92b1e79b5b93e8a3df6ee56e5771e80915 Mon Sep 17 00:00:00 2001 From: Carco_21 <144170194+carter-ktb21@users.noreply.github.com> Date: Fri, 8 Aug 2025 14:39:26 -0400 Subject: ChkBit comments and enum work (#2571) * Jagar cleanup * saru work * e_fm work * gob enum added * gob cleanup * gob anm enums * dComIfGs_isEventBit comments added * More bit work and besu enum work * Maybe fixed the issue? --- src/d/actor/d_a_myna.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/d/actor/d_a_myna.cpp') diff --git a/src/d/actor/d_a_myna.cpp b/src/d/actor/d_a_myna.cpp index 99478bcda6..54aadaa286 100644 --- a/src/d/actor/d_a_myna.cpp +++ b/src/d/actor/d_a_myna.cpp @@ -607,6 +607,7 @@ void daMyna_c::greet_talk_init() { void daMyna_c::greet_talk_move() { if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { dComIfGp_event_reset(); + /* dSv_event_flag_c::F_0802 - Faron Woods - Trill attacks when stealing */ if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { field_0x937 = 20; field_0x92C = 19; @@ -624,6 +625,7 @@ void daMyna_c::shopping_wait_init() { /* 809471E8-809475B4 001668 03CC+00 1/0 0/0 0/0 .text shopping_wait_move__8daMyna_cFv */ void daMyna_c::shopping_wait_move() { if (!daPy_py_c::checkNowWolf()) { + /* dSv_event_flag_c::F_0802 - Faron Woods - Trill attacks when stealing */ if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { field_0x92C = 17; field_0x937 = 20; @@ -663,8 +665,9 @@ void daMyna_c::shopping_wait_move() { } } - if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[203]) && - daMyna_evtTagActor1 != NULL) + /* dSv_event_flag_c::F_0203 - Shop - First tried to steal from unnmaned shop (Havent checked donation box) */ + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[203]) + && daMyna_evtTagActor1 != NULL) { cXyz stack_2c(1.0f, 1.0f, 1.0f); if (chkPlayerInEvtArea(daMyna_evtTagActor1, stack_2c)) { @@ -806,6 +809,7 @@ void daMyna_c::byebye_talk_move() { } dComIfGp_event_reset(); + /* dSv_event_flag_c::F_0802 - Faron Woods - Trill attacks when stealing */ if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { field_0x92C = 0x11; field_0x937 = 0x14; @@ -969,6 +973,7 @@ void daMyna_c::attack_wait2_move() { if (daMyna_evtTagActor0 != NULL) { cXyz stack_1c(1.0f, 1.0f, 1.0f); + /* dSv_event_flag_c::F_0802 - Faron Woods - Trill attacks when stealing */ if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { if (chkPlayerInEvtArea(daMyna_evtTagActor0, stack_1c)) { field_0x937 = 20; @@ -1025,6 +1030,7 @@ void daMyna_c::attack_fly2_move() { if (dMsgObject_getTotalPayment() > field_0x922) { field_0x937 = 0; + /* dSv_event_flag_c::F_0802 - Faron Woods - Trill attacks when stealing */ dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[802]); field_0x939 = 1; } @@ -1038,6 +1044,7 @@ void daMyna_c::attack_fly2_move() { } } else if (fly_return_move()) { if (field_0x937 == 0) { + /* dSv_event_flag_c::F_0802 - Faron Woods - Trill attacks when stealing */ dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[802]); } field_0x92C = 17; @@ -1064,6 +1071,7 @@ void daMyna_c::attack2_move() { if (field_0x937 != 0) { field_0x937--; if (dComIfGs_getLife() <= 1) { + /* dSv_event_flag_c::F_0802 - Faron Woods - Trill attacks when stealing */ dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[802]); field_0x937 = 0; } @@ -1289,6 +1297,7 @@ void daMyna_c::initiate() { field_0x920 = 0; field_0x922 = 0; + /* dSv_event_flag_c::F_0802 - Faron Woods - Trill attacks when stealing */ if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { field_0x932 = 0; field_0x938 = 0; @@ -1585,6 +1594,7 @@ void daMyna_c::checkDead() { if (daMyna_evtTagActor0 == NULL || (daMyna_evtTagActor0 != NULL && !chkPlayerInEvtArea(daMyna_evtTagActor0, var1))) { + /* dSv_event_flag_c::F_0203 - Shop - First tried to steal from unnmaned shop (Havent checked donation box) */ if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[203])) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[203]); } -- cgit v1.2.3