mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 14:45:33 +00:00
Code Issues Releases Wiki Activity

tabs -> spaces

Browse source
This commit is contained in:
Dmitriy 'Endorph' Shkurskiy 2014-01-07 14:32:14 +02:00
parent 116f125f05
commit 9afa8e952e
2 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
apps/openmw/mwworld/containerstore.cpp
View file

@ -557,7 +557,7 @@ MWWorld::ContainerStoreIterator::ContainerStoreIterator (ContainerStore *contain
MWWorld::ContainerStoreIterator::ContainerStoreIterator( const ContainerStoreIterator& src ) MWWorld::ContainerStoreIterator::ContainerStoreIterator( const ContainerStoreIterator& src )
{ {
copy(src); copy(src);
} }
void MWWorld::ContainerStoreIterator::incType() void MWWorld::ContainerStoreIterator::incType()
@ -814,37 +814,37 @@ const MWWorld::ContainerStore *MWWorld::ContainerStoreIterator::getContainerStor
void MWWorld::ContainerStoreIterator::copy(const ContainerStoreIterator& src) void MWWorld::ContainerStoreIterator::copy(const ContainerStoreIterator& src)
{ {
mType = src.mType; mType = src.mType;
mMask = src.mMask; mMask = src.mMask;
mContainer = src.mContainer; mContainer = src.mContainer;
mPtr = src.mPtr; mPtr = src.mPtr;
switch (mType) switch (mType)
{ {
case MWWorld::ContainerStore::Type_Potion: mPotion = src.mPotion; break; case MWWorld::ContainerStore::Type_Potion: mPotion = src.mPotion; break;
case MWWorld::ContainerStore::Type_Apparatus: mApparatus = src.mApparatus; break; case MWWorld::ContainerStore::Type_Apparatus: mApparatus = src.mApparatus; break;
case MWWorld::ContainerStore::Type_Armor: mArmor = src.mArmor; break; case MWWorld::ContainerStore::Type_Armor: mArmor = src.mArmor; break;
case MWWorld::ContainerStore::Type_Book: mBook = src.mBook; break; case MWWorld::ContainerStore::Type_Book: mBook = src.mBook; break;
case MWWorld::ContainerStore::Type_Clothing: mClothing = src.mClothing; break; case MWWorld::ContainerStore::Type_Clothing: mClothing = src.mClothing; break;
case MWWorld::ContainerStore::Type_Ingredient: mIngredient = src.mIngredient; break; case MWWorld::ContainerStore::Type_Ingredient: mIngredient = src.mIngredient; break;
case MWWorld::ContainerStore::Type_Light: mLight = src.mLight; break; case MWWorld::ContainerStore::Type_Light: mLight = src.mLight; break;
case MWWorld::ContainerStore::Type_Lockpick: mLockpick = src.mLockpick; break; case MWWorld::ContainerStore::Type_Lockpick: mLockpick = src.mLockpick; break;
case MWWorld::ContainerStore::Type_Miscellaneous: mMiscellaneous = src.mMiscellaneous; break; case MWWorld::ContainerStore::Type_Miscellaneous: mMiscellaneous = src.mMiscellaneous; break;
case MWWorld::ContainerStore::Type_Probe: mProbe = src.mProbe; break; case MWWorld::ContainerStore::Type_Probe: mProbe = src.mProbe; break;
case MWWorld::ContainerStore::Type_Repair: mRepair = src.mRepair; break; case MWWorld::ContainerStore::Type_Repair: mRepair = src.mRepair; break;
case MWWorld::ContainerStore::Type_Weapon: mWeapon = src.mWeapon; break; case MWWorld::ContainerStore::Type_Weapon: mWeapon = src.mWeapon; break;
case -1: break; case -1: break;
default: assert(0); default: assert(0);
} }
} }
MWWorld::ContainerStoreIterator& MWWorld::ContainerStoreIterator::operator=( const ContainerStoreIterator& rhs ) MWWorld::ContainerStoreIterator& MWWorld::ContainerStoreIterator::operator=( const ContainerStoreIterator& rhs )
{ {
if (this!=&rhs) if (this!=&rhs)
{ {
copy(rhs); copy(rhs);
} }
return *this; return *this;
} }
bool MWWorld::operator== (const ContainerStoreIterator& left, const ContainerStoreIterator& right) bool MWWorld::operator== (const ContainerStoreIterator& left, const ContainerStoreIterator& right)

8
apps/openmw/mwworld/containerstore.hpp
View file

@ -143,10 +143,6 @@ namespace MWWorld
MWWorld::CellRefList<ESM::Repair>::List::iterator mRepair; MWWorld::CellRefList<ESM::Repair>::List::iterator mRepair;
MWWorld::CellRefList<ESM::Weapon>::List::iterator mWeapon; MWWorld::CellRefList<ESM::Weapon>::List::iterator mWeapon;
public:
ContainerStoreIterator(const ContainerStoreIterator& src);
private: private:
ContainerStoreIterator (ContainerStore *container); ContainerStoreIterator (ContainerStore *container);
@ -187,6 +183,8 @@ namespace MWWorld
public: public:
ContainerStoreIterator(const ContainerStoreIterator& src);
Ptr *operator->() const; Ptr *operator->() const;
Ptr operator*() const; Ptr operator*() const;
@ -195,7 +193,7 @@ namespace MWWorld
ContainerStoreIterator operator++ (int); ContainerStoreIterator operator++ (int);
ContainerStoreIterator& operator= (const ContainerStoreIterator& rhs); ContainerStoreIterator& operator= (const ContainerStoreIterator& rhs);
bool isEqual (const ContainerStoreIterator& iter) const; bool isEqual (const ContainerStoreIterator& iter) const;