From 587440ab8e39d35f64bfa084570f1f3e245e3401 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 23 Aug 2002 08:30:10 +0000 Subject: [PATCH] class with virtual members must always have a virtual dtor (actually, any class that will be derived from should) --- stepmania/src/Actor.h | 3 +-- stepmania/src/ActorFrame.h | 2 +- stepmania/src/BitmapText.h | 2 +- stepmania/src/CroppedSprite.h | 1 + stepmania/src/RageBitmapTexture.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h index a600d04c21..a0cf65cd46 100644 --- a/stepmania/src/Actor.h +++ b/stepmania/src/Actor.h @@ -19,8 +19,7 @@ class Actor { public: Actor(); - - + virtual ~Actor() { } enum TweenType { TWEEN_LINEAR, diff --git a/stepmania/src/ActorFrame.h b/stepmania/src/ActorFrame.h index ac01b73181..9cea7ec5bd 100644 --- a/stepmania/src/ActorFrame.h +++ b/stepmania/src/ActorFrame.h @@ -22,9 +22,9 @@ class ActorFrame : public Actor protected: CArray m_SubActors; - public: void AddSubActor( Actor* pActor); + virtual ~ActorFrame() { } virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); diff --git a/stepmania/src/BitmapText.h b/stepmania/src/BitmapText.h index e7aae21f40..b39d617fc2 100644 --- a/stepmania/src/BitmapText.h +++ b/stepmania/src/BitmapText.h @@ -24,7 +24,7 @@ protected: public: BitmapText(); - ~BitmapText(); + virtual ~BitmapText(); bool LoadFromFont( CString sFontName ); diff --git a/stepmania/src/CroppedSprite.h b/stepmania/src/CroppedSprite.h index b2b3b9e447..9ef1ccb17c 100644 --- a/stepmania/src/CroppedSprite.h +++ b/stepmania/src/CroppedSprite.h @@ -19,6 +19,7 @@ class CroppedSprite : public Sprite { public: CroppedSprite(); + virtual ~CroppedSprite() { } bool Load( CString sFilePath, bool bForceReload = false, int iMipMaps = 4, int iAlphaBits = 4, bool bDither = false, bool bStretch = false ); void SetCroppedSize( float fWidth, float fHeight ); diff --git a/stepmania/src/RageBitmapTexture.h b/stepmania/src/RageBitmapTexture.h index 4ea8f948fd..db2a29198a 100644 --- a/stepmania/src/RageBitmapTexture.h +++ b/stepmania/src/RageBitmapTexture.h @@ -32,7 +32,7 @@ public: bool bDither = false, bool bStretch = false ); - ~RageBitmapTexture(); + virtual ~RageBitmapTexture(); virtual void Reload( DWORD dwMaxSize,