mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-03-30 09:36:43 +00:00
Fixed a few more non-virtual destructor warnings
This commit is contained in:
parent
1c0bf162f2
commit
e8eea03b4c
5 changed files with 25 additions and 5 deletions
|
@ -66,7 +66,7 @@ class Animation{
|
||||||
void stopScript();
|
void stopScript();
|
||||||
|
|
||||||
|
|
||||||
~Animation();
|
virtual ~Animation();
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,7 @@ namespace MWRender{
|
||||||
class CreatureAnimation: public Animation{
|
class CreatureAnimation: public Animation{
|
||||||
|
|
||||||
public:
|
public:
|
||||||
~CreatureAnimation();
|
virtual ~CreatureAnimation();
|
||||||
CreatureAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env, OEngine::Render::OgreRenderer& _rend);
|
CreatureAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env, OEngine::Render::OgreRenderer& _rend);
|
||||||
virtual void runAnimation(float timepassed);
|
virtual void runAnimation(float timepassed);
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ class NpcAnimation: public Animation{
|
||||||
|
|
||||||
public:
|
public:
|
||||||
NpcAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env, OEngine::Render::OgreRenderer& _rend);
|
NpcAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env, OEngine::Render::OgreRenderer& _rend);
|
||||||
~NpcAnimation();
|
virtual ~NpcAnimation();
|
||||||
Ogre::Entity* insertBoundedPart(const std::string &mesh, std::string bonename);
|
Ogre::Entity* insertBoundedPart(const std::string &mesh, std::string bonename);
|
||||||
void insertFreePart(const std::string &mesh, const std::string suffix, Ogre::SceneNode* insert);
|
void insertFreePart(const std::string &mesh, const std::string suffix, Ogre::SceneNode* insert);
|
||||||
virtual void runAnimation(float timepassed);
|
virtual void runAnimation(float timepassed);
|
||||||
|
|
|
@ -34,6 +34,8 @@ namespace MWRender
|
||||||
Ogre::SceneNode* rootNode
|
Ogre::SceneNode* rootNode
|
||||||
);
|
);
|
||||||
BillboardObject();
|
BillboardObject();
|
||||||
|
|
||||||
|
virtual ~BillboardObject() {}
|
||||||
|
|
||||||
void setColour(const Ogre::ColourValue& pColour);
|
void setColour(const Ogre::ColourValue& pColour);
|
||||||
void setPosition(const Ogre::Vector3& pPosition);
|
void setPosition(const Ogre::Vector3& pPosition);
|
||||||
|
@ -69,6 +71,8 @@ namespace MWRender
|
||||||
const Ogre::Vector3& position,
|
const Ogre::Vector3& position,
|
||||||
Ogre::SceneNode* rootNode
|
Ogre::SceneNode* rootNode
|
||||||
);
|
);
|
||||||
|
|
||||||
|
virtual ~Moon() {}
|
||||||
|
|
||||||
enum Phase
|
enum Phase
|
||||||
{
|
{
|
||||||
|
|
|
@ -22,6 +22,8 @@ namespace ESMS
|
||||||
|
|
||||||
struct RecList
|
struct RecList
|
||||||
{
|
{
|
||||||
|
virtual ~RecList() {}
|
||||||
|
|
||||||
virtual void load(ESMReader &esm, const std::string &id) = 0;
|
virtual void load(ESMReader &esm, const std::string &id) = 0;
|
||||||
virtual int getSize() = 0;
|
virtual int getSize() = 0;
|
||||||
virtual void listIdentifier (std::vector<std::string>& identifier) const = 0;
|
virtual void listIdentifier (std::vector<std::string>& identifier) const = 0;
|
||||||
|
@ -42,6 +44,8 @@ namespace ESMS
|
||||||
template <typename X>
|
template <typename X>
|
||||||
struct RecListT : RecList
|
struct RecListT : RecList
|
||||||
{
|
{
|
||||||
|
virtual ~RecListT() {}
|
||||||
|
|
||||||
typedef std::map<std::string,X> MapType;
|
typedef std::map<std::string,X> MapType;
|
||||||
|
|
||||||
MapType list;
|
MapType list;
|
||||||
|
@ -90,6 +94,8 @@ namespace ESMS
|
||||||
template <typename X>
|
template <typename X>
|
||||||
struct RecListWithIDT : RecList
|
struct RecListWithIDT : RecList
|
||||||
{
|
{
|
||||||
|
virtual ~RecListWithIDT() {}
|
||||||
|
|
||||||
typedef std::map<std::string,X> MapType;
|
typedef std::map<std::string,X> MapType;
|
||||||
|
|
||||||
MapType list;
|
MapType list;
|
||||||
|
@ -139,6 +145,8 @@ namespace ESMS
|
||||||
template <typename X>
|
template <typename X>
|
||||||
struct RecIDListT : RecList
|
struct RecIDListT : RecList
|
||||||
{
|
{
|
||||||
|
virtual ~RecIDListT() {}
|
||||||
|
|
||||||
typedef std::map<std::string,X> MapType;
|
typedef std::map<std::string,X> MapType;
|
||||||
|
|
||||||
MapType list;
|
MapType list;
|
||||||
|
@ -189,6 +197,8 @@ namespace ESMS
|
||||||
*/
|
*/
|
||||||
struct LTexList : RecList
|
struct LTexList : RecList
|
||||||
{
|
{
|
||||||
|
virtual ~LTexList() {}
|
||||||
|
|
||||||
// TODO: For multiple ESM/ESP files we need one list per file.
|
// TODO: For multiple ESM/ESP files we need one list per file.
|
||||||
std::vector<LandTexture> ltex;
|
std::vector<LandTexture> ltex;
|
||||||
int count;
|
int count;
|
||||||
|
@ -223,6 +233,8 @@ namespace ESMS
|
||||||
*/
|
*/
|
||||||
struct LandList : RecList
|
struct LandList : RecList
|
||||||
{
|
{
|
||||||
|
virtual ~LandList() {}
|
||||||
|
|
||||||
// Map containing all landscapes
|
// Map containing all landscapes
|
||||||
typedef std::map<int, Land*> LandsCol;
|
typedef std::map<int, Land*> LandsCol;
|
||||||
typedef std::map<int, LandsCol> Lands;
|
typedef std::map<int, LandsCol> Lands;
|
||||||
|
@ -296,7 +308,7 @@ namespace ESMS
|
||||||
identifier.push_back (iter->first);
|
identifier.push_back (iter->first);
|
||||||
}
|
}
|
||||||
|
|
||||||
~CellList()
|
virtual ~CellList()
|
||||||
{
|
{
|
||||||
for (IntCells::iterator it = intCells.begin(); it!=intCells.end(); ++it)
|
for (IntCells::iterator it = intCells.begin(); it!=intCells.end(); ++it)
|
||||||
delete it->second;
|
delete it->second;
|
||||||
|
@ -404,7 +416,7 @@ namespace ESMS
|
||||||
|
|
||||||
PathgridList() : count(0) {}
|
PathgridList() : count(0) {}
|
||||||
|
|
||||||
~PathgridList()
|
virtual ~PathgridList()
|
||||||
{
|
{
|
||||||
for (IntGrids::iterator it = intGrids.begin(); it!=intGrids.end(); ++it)
|
for (IntGrids::iterator it = intGrids.begin(); it!=intGrids.end(); ++it)
|
||||||
delete it->second;
|
delete it->second;
|
||||||
|
@ -482,6 +494,8 @@ namespace ESMS
|
||||||
template <typename X>
|
template <typename X>
|
||||||
struct ScriptListT : RecList
|
struct ScriptListT : RecList
|
||||||
{
|
{
|
||||||
|
virtual ~ScriptListT() {}
|
||||||
|
|
||||||
typedef std::map<std::string,X> MapType;
|
typedef std::map<std::string,X> MapType;
|
||||||
|
|
||||||
MapType list;
|
MapType list;
|
||||||
|
@ -533,6 +547,8 @@ namespace ESMS
|
||||||
template <typename X>
|
template <typename X>
|
||||||
struct IndexListT
|
struct IndexListT
|
||||||
{
|
{
|
||||||
|
virtual ~IndexListT() {}
|
||||||
|
|
||||||
typedef std::map<int, X> MapType;
|
typedef std::map<int, X> MapType;
|
||||||
|
|
||||||
MapType list;
|
MapType list;
|
||||||
|
|
Loading…
Reference in a new issue