Refactored dynamic cast to do internal error checking. Refactored all inventory and button slot update functions in menu components so they no longer require virtual dispatch when all we require is some passing of lamba functions to update inventories.
parent
f2e3405b5b
commit
bd066ee787
Binary file not shown.
@ -0,0 +1,219 @@ |
||||
#pragma region License |
||||
/*
|
||||
License (OLC-3) |
||||
~~~~~~~~~~~~~~~ |
||||
|
||||
Copyright 2018 - 2022 OneLoneCoder.com |
||||
|
||||
Redistribution and use in source and binary forms, with or without modification, |
||||
are permitted provided that the following conditions are met: |
||||
|
||||
1. Redistributions or derivations of source code must retain the above copyright |
||||
notice, this list of conditions and the following disclaimer. |
||||
|
||||
2. Redistributions or derivative works in binary form must reproduce the above |
||||
copyright notice. This list of conditions and the following disclaimer must be |
||||
reproduced in the documentation and/or other materials provided with the distribution. |
||||
|
||||
3. Neither the name of the copyright holder nor the names of its contributors may |
||||
be used to endorse or promote products derived from this software without specific |
||||
prior written permission. |
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY |
||||
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT |
||||
SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
||||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED |
||||
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR |
||||
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
||||
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
||||
SUCH DAMAGE. |
||||
|
||||
Portions of this software are copyright © 2023 The FreeType |
||||
Project (www.freetype.org). Please see LICENSE_FT.txt for more information. |
||||
All rights reserved. |
||||
*/ |
||||
#pragma endregion |
||||
#include "InventoryCreator.h" |
||||
#include "RowInventoryScrollableWindowComponent.h" |
||||
|
||||
#define DEFINE(SubName) InventoryCreator InventoryCreator::SubName##_InventoryUpdate(&InventoryCreator::SubName##_InventorySlotsUpdate,&InventoryCreator::SubName##_AddButtonOnSlotUpdate); |
||||
|
||||
DEFINE(Player); |
||||
DEFINE(RowPlayer); |
||||
DEFINE(RowMerchant); |
||||
DEFINE(RowPlayerWeapons); |
||||
DEFINE(RowPlayerArmor); |
||||
|
||||
#pragma region Player Inventory Updates |
||||
std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)> InventoryCreator::Player_InventorySlotsUpdate= |
||||
[](InventoryScrollableWindowComponent&component,ITCategory cat){ |
||||
size_t invSize=Inventory::get(cat).size(); |
||||
//We only want to refresh the inventory slots if the component count no longer matches what's actually in our inventory.
|
||||
if(component.components.size()<invSize){//We need more space to display our items.
|
||||
component.AddButtonOnSlotUpdate(cat); |
||||
}else |
||||
if(component.components.size()>invSize){ //There are empty spots, so let's clean up.
|
||||
component.RemoveAllComponents(); |
||||
for(std::weak_ptr<Item> item:Inventory::get(cat)){ |
||||
component.AddButtonOnSlotUpdate(cat); |
||||
} |
||||
} |
||||
}; |
||||
std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)> InventoryCreator::Player_AddButtonOnSlotUpdate= |
||||
[](InventoryScrollableWindowComponent&component,ITCategory cat){ |
||||
size_t invSize=component.components.size()+1; |
||||
int invWidth=int(component.rect.size.x/(float(component.options.size.x)+component.options.padding)); |
||||
int x=int((invSize-1)%invWidth); |
||||
int y=int((invSize-1)/invWidth); |
||||
int itemIndex=y*invWidth+x; |
||||
|
||||
vf2d buttonSize=component.options.size; |
||||
int totalSpacing=component.options.padding+buttonSize.x; |
||||
|
||||
component.ADD("item_"+cat+"_"+std::to_string(itemIndex),MenuItemButton)({{float(totalSpacing*x),float(totalSpacing*y)},buttonSize},Inventory::get(cat),itemIndex,component.inventoryButtonClickAction,component.inventoryButtonHoverAction,component.inventoryButtonMouseOutAction,component.parentMenu,component.itemNameLabelName,component.itemDescriptionLabelName,component.inventoryButtonsActive?IconButtonAttr::SELECTABLE:IconButtonAttr::NOT_SELECTABLE)END |
||||
->SetCompactDescriptions(component.compact==COMPACT); |
||||
}; |
||||
#pragma endregion |
||||
|
||||
#pragma region Row Inventory Player Updates |
||||
std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)> InventoryCreator::RowPlayer_InventorySlotsUpdate=Player_InventorySlotsUpdate; |
||||
std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)> InventoryCreator::RowPlayer_AddButtonOnSlotUpdate= |
||||
[](InventoryScrollableWindowComponent&component,ITCategory cat){ |
||||
RowInventoryScrollableWindowComponent*c=DYNAMIC_CAST<RowInventoryScrollableWindowComponent*>(&component); |
||||
size_t invSize=c->components.size()+1; |
||||
int invWidth=int(c->rect.size.x/(float(c->options.size.x)+c->options.padding)); |
||||
int x=int((invSize-1)%invWidth); |
||||
int y=int((invSize-1)/invWidth); |
||||
int itemIndex=y*invWidth+x; |
||||
|
||||
vf2d buttonSize=c->options.size; |
||||
vf2d totalSpacing={c->options.padding+buttonSize.x,c->options.padding+buttonSize.y}; |
||||
|
||||
auto newItem=c->ADD("item_"+cat+"_"+std::to_string(itemIndex),RowItemDisplay)({totalSpacing*vf2d{float(x),float(y)},buttonSize},Inventory::GetInventorySlot(cat,itemIndex),c->inventoryButtonClickAction,c->itemNameLabelName,c->itemDescriptionLabelName,c->inventoryButtonsActive?ButtonAttr::NONE:ButtonAttr::UNSELECTABLE)END; |
||||
newItem->SetCompactDescriptions(c->compact==COMPACT); |
||||
newItem->SetPriceLabelType(c->priceLabel); |
||||
newItem->SetHoverFunc(c->inventoryButtonHoverAction); |
||||
newItem->SetMouseOutFunc(c->inventoryButtonMouseOutAction); |
||||
}; |
||||
#pragma endregion |
||||
|
||||
#pragma region Row Merchant Updates |
||||
std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)> InventoryCreator::RowMerchant_InventorySlotsUpdate= |
||||
[](InventoryScrollableWindowComponent&component,ITCategory cat){ |
||||
const std::vector<std::shared_ptr<Item>>&merchantInv=Merchant::GetCurrentTravelingMerchant().GetShopItems(); |
||||
//We only want to refresh the inventory slots if the component count no longer matches what's actually in our inventory.
|
||||
if(component.components.size()<merchantInv.size()){//We need more space to display our items.
|
||||
component.AddButtonOnSlotUpdate(cat); |
||||
}else |
||||
if(component.components.size()>merchantInv.size()){ //There are empty spots, so let's clean up.
|
||||
component.RemoveAllComponents(); |
||||
for(std::shared_ptr<Item> item:merchantInv){ |
||||
component.AddButtonOnSlotUpdate(cat); |
||||
} |
||||
} |
||||
}; |
||||
std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)> InventoryCreator::RowMerchant_AddButtonOnSlotUpdate= |
||||
[](InventoryScrollableWindowComponent&component,ITCategory cat){ |
||||
const std::vector<std::shared_ptr<Item>>&merchantInv=Merchant::GetCurrentTravelingMerchant().GetShopItems(); |
||||
RowInventoryScrollableWindowComponent*c=DYNAMIC_CAST<RowInventoryScrollableWindowComponent*>(&component); |
||||
|
||||
size_t invSize=c->components.size()+1; |
||||
int invWidth=int(c->rect.size.x/(float(c->options.size.x)+c->options.padding)); |
||||
int x=int((invSize-1)%invWidth); |
||||
int y=int((invSize-1)/invWidth); |
||||
int itemIndex=y*invWidth+x; |
||||
|
||||
vf2d buttonSize=c->options.size; |
||||
vf2d totalSpacing={c->options.padding+buttonSize.x,c->options.padding+buttonSize.y}; |
||||
|
||||
auto newItem=c->ADD("merchant_item_"+cat+"_"+std::to_string(itemIndex),RowItemDisplay)({totalSpacing*vf2d{float(x),float(y)},buttonSize},Merchant::GetCurrentTravelingMerchant().GetShopItems()[itemIndex],c->inventoryButtonClickAction,c->itemNameLabelName,c->itemDescriptionLabelName,c->inventoryButtonsActive?ButtonAttr::NONE:ButtonAttr::UNSELECTABLE)END; |
||||
newItem->SetCompactDescriptions(c->compact==COMPACT); |
||||
newItem->SetPriceLabelType(c->priceLabel); |
||||
newItem->SetHoverFunc(c->inventoryButtonHoverAction); |
||||
newItem->SetMouseOutFunc(c->inventoryButtonMouseOutAction); |
||||
}; |
||||
#pragma endregion |
||||
|
||||
#pragma region Row Player Weapons Updates |
||||
std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)> InventoryCreator::RowPlayerWeapons_InventorySlotsUpdate= |
||||
[](InventoryScrollableWindowComponent&component,ITCategory cat){ |
||||
std::vector<std::shared_ptr<Item>>weapons; |
||||
std::copy_if(Inventory::get("Equipment").begin(),Inventory::get("Equipment").end(),std::back_inserter(weapons),[](std::shared_ptr<Item> item){return item.get()->IsWeapon();}); |
||||
//We only want to refresh the inventory slots if the component count no longer matches what's actually in our inventory.
|
||||
if(component.components.size()<weapons.size()){//We need more space to display our items.
|
||||
component.AddButtonOnSlotUpdate(cat); |
||||
}else |
||||
if(component.components.size()>weapons.size()){ //There are empty spots, so let's clean up.
|
||||
component.RemoveAllComponents(); |
||||
for(std::weak_ptr<Item> item:Inventory::get(cat)){ |
||||
component.AddButtonOnSlotUpdate(cat); |
||||
} |
||||
} |
||||
}; |
||||
std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)> InventoryCreator::RowPlayerWeapons_AddButtonOnSlotUpdate= |
||||
[](InventoryScrollableWindowComponent&component,ITCategory cat){
|
||||
std::vector<std::shared_ptr<Item>>weapons; |
||||
std::copy_if(Inventory::get("Equipment").begin(),Inventory::get("Equipment").end(),std::back_inserter(weapons),[](std::shared_ptr<Item> item){return item.get()->IsWeapon();}); |
||||
|
||||
RowInventoryScrollableWindowComponent*c=DYNAMIC_CAST<RowInventoryScrollableWindowComponent*>(&component); |
||||
size_t invSize=c->components.size()+1; |
||||
int invWidth=int(c->rect.size.x/(float(c->options.size.x)+c->options.padding)); |
||||
int x=int((invSize-1)%invWidth); |
||||
int y=int((invSize-1)/invWidth); |
||||
int itemIndex=y*invWidth+x; |
||||
|
||||
vf2d buttonSize=c->options.size; |
||||
vf2d totalSpacing={c->options.padding+buttonSize.x,c->options.padding+buttonSize.y}; |
||||
|
||||
for(std::shared_ptr<Item> weapon:weapons){ |
||||
auto newItem=c->ADD("item_"+cat+"_"+std::to_string(itemIndex),RowItemDisplay)({totalSpacing*vf2d{float(x),float(y)},buttonSize},weapon,c->inventoryButtonClickAction,c->itemNameLabelName,c->itemDescriptionLabelName,c->inventoryButtonsActive?ButtonAttr::NONE:ButtonAttr::UNSELECTABLE)END; |
||||
newItem->SetCompactDescriptions(c->compact==COMPACT); |
||||
newItem->SetPriceLabelType(c->priceLabel); |
||||
newItem->SetHoverFunc(c->inventoryButtonHoverAction); |
||||
newItem->SetMouseOutFunc(c->inventoryButtonMouseOutAction); |
||||
} |
||||
}; |
||||
#pragma endregion |
||||
|
||||
#pragma region Row Player Armor Updates |
||||
std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)> InventoryCreator::RowPlayerArmor_InventorySlotsUpdate= |
||||
[](InventoryScrollableWindowComponent&component,ITCategory cat){ |
||||
std::vector<std::shared_ptr<Item>>armor; |
||||
std::copy_if(Inventory::get("Equipment").begin(),Inventory::get("Equipment").end(),std::back_inserter(armor),[](std::shared_ptr<Item> item){return item.get()->IsArmor();}); |
||||
//We only want to refresh the inventory slots if the component count no longer matches what's actually in our inventory.
|
||||
if(component.components.size()<armor.size()){//We need more space to display our items.
|
||||
component.AddButtonOnSlotUpdate(cat); |
||||
}else |
||||
if(component.components.size()>armor.size()){ //There are empty spots, so let's clean up.
|
||||
component.RemoveAllComponents(); |
||||
for(std::weak_ptr<Item> item:Inventory::get(cat)){ |
||||
component.AddButtonOnSlotUpdate(cat); |
||||
} |
||||
} |
||||
}; |
||||
std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)> InventoryCreator::RowPlayerArmor_AddButtonOnSlotUpdate= |
||||
[](InventoryScrollableWindowComponent&component,ITCategory cat){ |
||||
std::vector<std::shared_ptr<Item>>armor; |
||||
std::copy_if(Inventory::get("Equipment").begin(),Inventory::get("Equipment").end(),std::back_inserter(armor),[](std::shared_ptr<Item> item){return item.get()->IsArmor();}); |
||||
|
||||
RowInventoryScrollableWindowComponent*c=DYNAMIC_CAST<RowInventoryScrollableWindowComponent*>(&component); |
||||
size_t invSize=c->components.size()+1; |
||||
int invWidth=int(c->rect.size.x/(float(c->options.size.x)+c->options.padding)); |
||||
int x=int((invSize-1)%invWidth); |
||||
int y=int((invSize-1)/invWidth); |
||||
int itemIndex=y*invWidth+x; |
||||
|
||||
vf2d buttonSize=c->options.size; |
||||
vf2d totalSpacing={c->options.padding+buttonSize.x,c->options.padding+buttonSize.y}; |
||||
|
||||
for(std::shared_ptr<Item> armor:armor){ |
||||
auto newItem=c->ADD("item_"+cat+"_"+std::to_string(itemIndex),RowItemDisplay)({totalSpacing*vf2d{float(x),float(y)},buttonSize},armor,c->inventoryButtonClickAction,c->itemNameLabelName,c->itemDescriptionLabelName,c->inventoryButtonsActive?ButtonAttr::NONE:ButtonAttr::UNSELECTABLE)END; |
||||
newItem->SetCompactDescriptions(c->compact==COMPACT); |
||||
newItem->SetPriceLabelType(c->priceLabel); |
||||
newItem->SetHoverFunc(c->inventoryButtonHoverAction); |
||||
newItem->SetMouseOutFunc(c->inventoryButtonMouseOutAction); |
||||
} |
||||
}; |
||||
#pragma endregion |
||||
@ -0,0 +1,65 @@ |
||||
#pragma region License |
||||
/*
|
||||
License (OLC-3) |
||||
~~~~~~~~~~~~~~~ |
||||
|
||||
Copyright 2018 - 2022 OneLoneCoder.com |
||||
|
||||
Redistribution and use in source and binary forms, with or without modification, |
||||
are permitted provided that the following conditions are met: |
||||
|
||||
1. Redistributions or derivations of source code must retain the above copyright |
||||
notice, this list of conditions and the following disclaimer. |
||||
|
||||
2. Redistributions or derivative works in binary form must reproduce the above |
||||
copyright notice. This list of conditions and the following disclaimer must be |
||||
reproduced in the documentation and/or other materials provided with the distribution. |
||||
|
||||
3. Neither the name of the copyright holder nor the names of its contributors may |
||||
be used to endorse or promote products derived from this software without specific |
||||
prior written permission. |
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY |
||||
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT |
||||
SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
||||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED |
||||
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR |
||||
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
||||
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
||||
SUCH DAMAGE. |
||||
|
||||
Portions of this software are copyright © 2023 The FreeType |
||||
Project (www.freetype.org). Please see LICENSE_FT.txt for more information. |
||||
All rights reserved. |
||||
*/ |
||||
#pragma endregion |
||||
#pragma once |
||||
#include "Item.h" |
||||
|
||||
//WARNING! This macro will leave the member scoping at a PRIVATE level upon completion!
|
||||
#define _SETUP(SubName) \ |
||||
private: \
|
||||
static std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)> SubName##_InventorySlotsUpdate; \
|
||||
static std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)> SubName##_AddButtonOnSlotUpdate; \
|
||||
public: \
|
||||
static InventoryCreator SubName##_InventoryUpdate; \
|
||||
private: |
||||
|
||||
class InventoryScrollableWindowComponent; |
||||
|
||||
class InventoryCreator{ |
||||
_SETUP(Player); |
||||
_SETUP(RowPlayer); |
||||
_SETUP(RowMerchant); |
||||
_SETUP(RowPlayerWeapons); |
||||
_SETUP(RowPlayerArmor); |
||||
public: |
||||
const std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)>*const InventorySlotsUpdate; |
||||
const std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)>*const AddButtonOnSlotUpdate; |
||||
inline InventoryCreator( |
||||
std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)>*const InventorySlotsUpdate, |
||||
std::function<void(InventoryScrollableWindowComponent&component,ITCategory cat)>*const AddButtonOnSlotUpdate) |
||||
:InventorySlotsUpdate(InventorySlotsUpdate),AddButtonOnSlotUpdate(AddButtonOnSlotUpdate){}; |
||||
}; |
||||
@ -1,78 +0,0 @@ |
||||
#pragma region License |
||||
/*
|
||||
License (OLC-3) |
||||
~~~~~~~~~~~~~~~ |
||||
|
||||
Copyright 2018 - 2022 OneLoneCoder.com |
||||
|
||||
Redistribution and use in source and binary forms, with or without modification, |
||||
are permitted provided that the following conditions are met: |
||||
|
||||
1. Redistributions or derivations of source code must retain the above copyright |
||||
notice, this list of conditions and the following disclaimer. |
||||
|
||||
2. Redistributions or derivative works in binary form must reproduce the above |
||||
copyright notice. This list of conditions and the following disclaimer must be |
||||
reproduced in the documentation and/or other materials provided with the distribution. |
||||
|
||||
3. Neither the name of the copyright holder nor the names of its contributors may |
||||
be used to endorse or promote products derived from this software without specific |
||||
prior written permission. |
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY |
||||
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT |
||||
SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
||||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED |
||||
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR |
||||
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
||||
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
||||
SUCH DAMAGE. |
||||
|
||||
Portions of this software are copyright © 2023 The FreeType |
||||
Project (www.freetype.org). Please see LICENSE_FT.txt for more information. |
||||
All rights reserved. |
||||
*/ |
||||
#pragma endregion |
||||
|
||||
#include "RowInventoryScrollableWindowComponent.h" |
||||
|
||||
class RowMerchantInventoryScrollableWindowComponent:public RowInventoryScrollableWindowComponent{ |
||||
public: |
||||
inline RowMerchantInventoryScrollableWindowComponent(geom2d::rect<float>rect,std::string itemNameLabelName,std::string itemDescriptionLabelName,std::function<bool(MenuFuncData)>inventoryButtonClickAction,std::function<bool(MenuFuncData)>inventoryButtonHoverAction,std::function<bool(MenuFuncData)>inventoryButtonMouseOutAction,InventoryWindowOptions options={.padding=8,.size={24,24}},bool inventoryButtonsActive=true,ComponentAttr attributes=ComponentAttr::BACKGROUND|ComponentAttr::OUTLINE) |
||||
:RowInventoryScrollableWindowComponent(rect,itemNameLabelName,itemDescriptionLabelName,inventoryButtonClickAction,inventoryButtonHoverAction,inventoryButtonMouseOutAction,options,inventoryButtonsActive,attributes){} |
||||
|
||||
|
||||
virtual inline void OnInventorySlotsUpdate(ITCategory cat)override{ |
||||
const std::vector<std::shared_ptr<Item>>&merchantInv=Merchant::GetCurrentTravelingMerchant().GetShopItems(); |
||||
//We only want to refresh the inventory slots if the component count no longer matches what's actually in our inventory.
|
||||
if(components.size()<merchantInv.size()){//We need more space to display our items.
|
||||
AddButtonOnSlotUpdate(cat); |
||||
}else |
||||
if(components.size()>merchantInv.size()){ //There are empty spots, so let's clean up.
|
||||
RemoveAllComponents(); |
||||
for(std::shared_ptr<Item> item:merchantInv){ |
||||
AddButtonOnSlotUpdate(cat); |
||||
} |
||||
} |
||||
} |
||||
|
||||
virtual inline void AddButtonOnSlotUpdate(ITCategory cat)override{ |
||||
const std::vector<std::shared_ptr<Item>>&merchantInv=Merchant::GetCurrentTravelingMerchant().GetShopItems(); |
||||
size_t invSize=components.size()+1; |
||||
int invWidth=int(rect.size.x/(float(options.size.x)+options.padding)); |
||||
int x=int((invSize-1)%invWidth); |
||||
int y=int((invSize-1)/invWidth); |
||||
int itemIndex=y*invWidth+x; |
||||
|
||||
vf2d buttonSize=options.size; |
||||
vf2d totalSpacing={options.padding+buttonSize.x,options.padding+buttonSize.y}; |
||||
|
||||
auto newItem=ADD("merchant_item_"+cat+"_"+std::to_string(itemIndex),RowItemDisplay)({totalSpacing*vf2d{float(x),float(y)},buttonSize},Merchant::GetCurrentTravelingMerchant().GetShopItems()[itemIndex],inventoryButtonClickAction,itemNameLabelName,itemDescriptionLabelName,inventoryButtonsActive?ButtonAttr::NONE:ButtonAttr::UNSELECTABLE)END; |
||||
newItem->SetCompactDescriptions(compact==COMPACT); |
||||
newItem->SetPriceLabelType(priceLabel); |
||||
newItem->SetHoverFunc(inventoryButtonHoverAction); |
||||
newItem->SetMouseOutFunc(inventoryButtonMouseOutAction); |
||||
} |
||||
}; |
||||
Loading…
Reference in new issue