diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-05-31 05:18:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-31 15:18:54 +0300 |
| commit | 7b550fafb5ea4f64225bd4c281cb50214dcb6833 (patch) | |
| tree | d4efa72ba15ff71a96e8396586ba3472ba87f6b7 /src/d/d_shop_system.cpp | |
| parent | 4c4370b03caf504926a444e4fc68f3a8ba07bba8 (diff) | |
d_a_npc cleanup (#2466)
* d_a_npc first cleanup pass
* more d_a_npc cleanup
Diffstat (limited to 'src/d/d_shop_system.cpp')
| -rw-r--r-- | src/d/d_shop_system.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/d/d_shop_system.cpp b/src/d/d_shop_system.cpp index b90f77f7ab..9d077d142b 100644 --- a/src/d/d_shop_system.cpp +++ b/src/d/d_shop_system.cpp @@ -940,12 +940,12 @@ int dShopSystem_c::seq_start(fopAc_ac_c* actor, dMsgFlow_c* i_flow) { if (i_flow->doFlow(actor, NULL, 0)) { int itemNo; if (mFlow.getEventId(&itemNo) == 1) { - if (mItemId == -1) { - mItemId = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, + if (mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) { + mItemPartnerId = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, -1, NULL, NULL); } - if (fpcEx_IsExist(mItemId)) { + if (fpcEx_IsExist(mItemPartnerId)) { mEvtNo = 1; evtChange(); return 1; @@ -1244,12 +1244,12 @@ int dShopSystem_c::seq_decide_yes(fopAc_ac_c* actor, dMsgFlow_c* i_flow) { int itemNo; if (mFlow.getEventId(&itemNo) == 1) { if (i_flow->doFlow(actor, NULL, 0)) { - if (mItemId == -1) { - mItemId = + if (mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) { + mItemPartnerId = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, -1, NULL, NULL); } - if (fpcEx_IsExist(mItemId)) { + if (fpcEx_IsExist(mItemPartnerId)) { offFlag(8); setSoldOutItemHide(); mEvtNo = 1; |
