From c43f80633a87f9bb45476e7942f4dc185be4abf1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 18 Dec 2015 16:48:19 +0100
Subject: [PATCH] Accept a ConstPtr in getEnchantmentPoints
---
apps/openmw/mwclass/armor.cpp | 5 ++---
apps/openmw/mwclass/armor.hpp | 2 +-
apps/openmw/mwclass/book.cpp | 5 ++---
apps/openmw/mwclass/book.hpp | 2 +-
apps/openmw/mwclass/clothing.cpp | 5 ++---
apps/openmw/mwclass/clothing.hpp | 2 +-
apps/openmw/mwclass/weapon.cpp | 5 ++---
apps/openmw/mwclass/weapon.hpp | 2 +-
apps/openmw/mwworld/class.cpp | 2 +-
apps/openmw/mwworld/class.hpp | 2 +-
10 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index f11bbcda8d..5a5265e17c 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -371,10 +371,9 @@ namespace MWClass
return MWWorld::Ptr(cell.insert(ref), &cell);
}
- int Armor::getEnchantmentPoints (const MWWorld::Ptr& ptr) const
+ int Armor::getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const
{
- MWWorld::LiveCellRef<ESM::Armor> *ref =
- ptr.get<ESM::Armor>();
+ const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
return ref->mBase->mData.mEnchant;
}
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index 598b779299..5e7f1c2edc 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -82,7 +82,7 @@ namespace MWClass
virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
- virtual int getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
+ virtual int getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const;
virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index faea0d6f25..56b573ee38 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -179,10 +179,9 @@ namespace MWClass
return MWWorld::Ptr(cell.insert(ref), &cell);
}
- int Book::getEnchantmentPoints (const MWWorld::Ptr& ptr) const
+ int Book::getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const
{
- MWWorld::LiveCellRef<ESM::Book> *ref =
- ptr.get<ESM::Book>();
+ const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
return ref->mBase->mData.mEnchant;
}
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index 6b8be41bb1..7d2f578ccc 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -61,7 +61,7 @@ namespace MWClass
virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
- virtual int getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
+ virtual int getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const;
virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 2e2b8af84e..73a012cdb4 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -264,10 +264,9 @@ namespace MWClass
return MWWorld::Ptr(cell.insert(ref), &cell);
}
- int Clothing::getEnchantmentPoints (const MWWorld::Ptr& ptr) const
+ int Clothing::getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const
{
- MWWorld::LiveCellRef<ESM::Clothing> *ref =
- ptr.get<ESM::Clothing>();
+ const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
return ref->mBase->mData.mEnchant;
}
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index 42d1a7ea47..bb9fd3492c 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -74,7 +74,7 @@ namespace MWClass
virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
- virtual int getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
+ virtual int getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const;
virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 085954c815..0018ff930f 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -405,10 +405,9 @@ namespace MWClass
return MWWorld::Ptr(cell.insert(ref), &cell);
}
- int Weapon::getEnchantmentPoints (const MWWorld::Ptr& ptr) const
+ int Weapon::getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const
{
- MWWorld::LiveCellRef<ESM::Weapon> *ref =
- ptr.get<ESM::Weapon>();
+ const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
return ref->mBase->mData.mEnchant;
}
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index 9acda286b3..9426a14350 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -85,7 +85,7 @@ namespace MWClass
virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
- virtual int getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
+ virtual int getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const;
};
}
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index fab74094ab..6e699dd97f 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -173,7 +173,7 @@ namespace MWWorld
return 0;
}
- int Class::getEnchantmentPoints (const MWWorld::Ptr& ptr) const
+ int Class::getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const
{
throw std::runtime_error ("class does not support enchanting");
}
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 207fc8a20a..943cfc451a 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -255,7 +255,7 @@ namespace MWWorld
///< @return the enchantment ID if the object is enchanted, otherwise an empty string
/// (default implementation: return empty string)
- virtual int getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
+ virtual int getEnchantmentPoints (const MWWorld::ConstPtr& ptr) const;
///< @return the number of enchantment points available for possible enchanting
virtual void adjustScale(const MWWorld::ConstPtr& ptr, osg::Vec3f& scale, bool rendering) const;