mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-02 01:36:41 +00:00
Code Issues Releases Wiki Activity

use Class::getInventoryStore instead of casting ContainerStore.

Browse source
This commit is contained in:
scrawl 2012-05-19 16:04:34 +02:00
parent 4fb30544d4
commit 2a4c55f1ab
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwgui/inventorywindow.cpp
View file

@ -142,7 +142,7 @@ namespace MWGui
if (mDragAndDrop->mDraggedFrom != this) if (mDragAndDrop->mDraggedFrom != this)
{ {
// add item to the player's inventory // add item to the player's inventory
MWWorld::InventoryStore& invStore = static_cast<MWWorld::InventoryStore&>(MWWorld::Class::get(mContainer).getContainerStore(mContainer)); MWWorld::ContainerStore& invStore = MWWorld::Class::get(mContainer).getContainerStore(mContainer);
MWWorld::ContainerStoreIterator it = invStore.begin(); MWWorld::ContainerStoreIterator it = invStore.begin();
int origCount = ptr.getRefData().getCount(); int origCount = ptr.getRefData().getCount();
@ -179,7 +179,7 @@ namespace MWGui
std::vector<MWWorld::Ptr> InventoryWindow::getEquippedItems() std::vector<MWWorld::Ptr> InventoryWindow::getEquippedItems()
{ {
MWWorld::InventoryStore& invStore = static_cast<MWWorld::InventoryStore&>(MWWorld::Class::get(mContainer).getContainerStore(mContainer)); MWWorld::InventoryStore& invStore = MWWorld::Class::get(mContainer).getInventoryStore(mContainer);
std::vector<MWWorld::Ptr> items; std::vector<MWWorld::Ptr> items;
@ -197,7 +197,7 @@ namespace MWGui
void InventoryWindow::_unequipItem(MWWorld::Ptr item) void InventoryWindow::_unequipItem(MWWorld::Ptr item)
{ {
MWWorld::InventoryStore& invStore = static_cast<MWWorld::InventoryStore&>(MWWorld::Class::get(mContainer).getContainerStore(mContainer)); MWWorld::InventoryStore& invStore = MWWorld::Class::get(mContainer).getInventoryStore(mContainer);
for (int slot=0; slot < MWWorld::InventoryStore::Slots; ++slot) for (int slot=0; slot < MWWorld::InventoryStore::Slots; ++slot)
{ {
@ -231,7 +231,7 @@ namespace MWGui
int InventoryWindow::getPlayerGold() int InventoryWindow::getPlayerGold()
{ {
MWWorld::InventoryStore& invStore = static_cast<MWWorld::InventoryStore&>(MWWorld::Class::get(mContainer).getContainerStore(mContainer)); MWWorld::InventoryStore& invStore = MWWorld::Class::get(mContainer).getInventoryStore(mContainer);
for (MWWorld::ContainerStoreIterator it = invStore.begin(); for (MWWorld::ContainerStoreIterator it = invStore.begin();
it != invStore.end(); ++it) it != invStore.end(); ++it)

4
apps/openmw/mwgui/tradewindow.cpp
View file

@ -268,7 +268,7 @@ namespace MWGui
return items; return items;
} }
MWWorld::InventoryStore& invStore = static_cast<MWWorld::InventoryStore&>(MWWorld::Class::get(mContainer).getContainerStore(mContainer)); MWWorld::InventoryStore& invStore = MWWorld::Class::get(mContainer).getInventoryStore(mContainer);
for (int slot=0; slot < MWWorld::InventoryStore::Slots; ++slot) for (int slot=0; slot < MWWorld::InventoryStore::Slots; ++slot)
{ {
@ -327,7 +327,7 @@ namespace MWGui
std::vector<MWWorld::Ptr> TradeWindow::itemsToIgnore() std::vector<MWWorld::Ptr> TradeWindow::itemsToIgnore()
{ {
std::vector<MWWorld::Ptr> items; std::vector<MWWorld::Ptr> items;
MWWorld::InventoryStore& invStore = static_cast<MWWorld::InventoryStore&>(MWWorld::Class::get(mContainer).getContainerStore(mContainer)); MWWorld::ContainerStore& invStore = MWWorld::Class::get(mContainer).getContainerStore(mContainer);
for (MWWorld::ContainerStoreIterator it = invStore.begin(); for (MWWorld::ContainerStoreIterator it = invStore.begin();
it != invStore.end(); ++it) it != invStore.end(); ++it)