mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-01 08:22:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove unneeded conditional

Browse Source
This commit is contained in:
gymnast86
2026-08-30 05:25:25 -07:00
parent 3400162438
commit 5cbc1f58a0
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_life_container.cpp
+4 -14
View File
@@ -162,33 +162,23 @@ int daObjLife_c::create() {
if (mItemGiveOriginalNo == dItemNo_NONE_e) {
mOriginalItemNo = parameterItemNo;
mItemGiveTag = dusk::mods::item_give_tag_freestanding(getSaveBitNo());
const auto [item, displayItem, _] =
const auto [item, displayItem, was_resolved] =
dusk::mods::item_check_resolve(mItemGiveTag, mOriginalItemNo, this);
setDisplayItemNo(displayItem);
mItemOverridden = item != mOriginalItemNo;
mItemOverridden = was_resolved;
if (mItemOverridden) {
fopAcM_SetParam(this, (params & 0xFFFFFF00) | item);
}
} else if (mGoldenWolfItem) {
mOriginalItemNo = mItemGiveOriginalNo;
mItemGiveTag = dusk::mods::item_give_tag_golden_wolf(static_cast<u16>(field_0x938));
const auto [item, displayItem, _] =
const auto [item, displayItem, was_resolved] =
dusk::mods::item_check_resolve(mItemGiveTag, mOriginalItemNo, this);
setDisplayItemNo(displayItem);
mItemOverridden = item != mOriginalItemNo;
mItemOverridden = was_resolved;
if (item != parameterItemNo) {
fopAcM_SetParam(this, (params & 0xFFFFFF00) | item);
}
} else if (mGoldenWolfItem) {
mOriginalItemNo = mItemGiveOriginalNo;
const u16 obtainedItemFlag = static_cast<u16>(field_0x938);
const u8 resolvedItem =
dusk::mods::item_check_golden_wolf(obtainedItemFlag, mOriginalItemNo, this);
mItemGiveTag = dusk::mods::item_give_tag_golden_wolf(obtainedItemFlag);
mItemOverridden = resolvedItem != mOriginalItemNo;
if (resolvedItem != parameterItemNo) {
fopAcM_SetParam(this, (params & 0xFFFFFF00) | resolvedItem);
}
} else {
mOriginalItemNo = mItemGiveOriginalNo;
setDisplayItemNo(