mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-09-07 03:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused field progressive from Item (#7113)

Browse Source
This commit is contained in:
Philip Dubé
2026-08-23 21:24:07 +00:00
committed by GitHub
parent 07414fd722
commit b341e02cd5
3 changed files with 49 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/randomizer/item.cpp
+5 -7
View File
@@ -12,17 +12,16 @@
namespace Rando {
Item::Item()
: randomizerGet(RG_NONE), type(ITEMTYPE_ITEM), getItemId(GI_NONE), advancement(false), hintKey(RHT_NONE),
progressive(false), price(0) {
: randomizerGet(RG_NONE), type(ITEMTYPE_ITEM), getItemId(GI_NONE), advancement(false), hintKey(RHT_NONE), price(0) {
}
Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_,
const bool advancement_, LogicVal logicVal_, const RandomizerHintTextKey hintKey_, const uint16_t itemId_,
const uint16_t objectId_, const uint16_t gid_, const uint16_t textId_, const uint16_t field_,
const int16_t chestAnimation_, const GetItemCategory category_, const uint16_t modIndex_, Text article_,
const std::string color_, const bool progressive_, const uint16_t price_)
const std::string color_, const uint16_t price_)
: randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), category(category_),
article(std::move(article_)), color(std::move(color_)), progressive(progressive_), price(price_) {
article(std::move(article_)), color(std::move(color_)), price(price_) {
if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) {
giEntry = std::make_shared<GetItemEntry>(GetItemEntry{
@@ -39,11 +38,10 @@ Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_,
Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_,
const bool advancement_, LogicVal logicVal_, const RandomizerHintTextKey hintKey_,
const GetItemCategory category_, Text article_, const std::string color_, const bool progressive_,
const uint16_t price_)
const GetItemCategory category_, Text article_, const std::string color_, const uint16_t price_)
: randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), category(category_),
article(std::move(article_)), color(std::move(color_)), progressive(progressive_), price(price_) {
article(std::move(article_)), color(std::move(color_)), price(price_) {
}
void Item::ApplyEffect() const {