summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2008-10-23 17:49:34 +0000
committerIra Rice <irarice@gmail.com>2008-10-23 17:49:34 +0000
commitc4a46650d7416b63a6fdcb4b2791839d15ca73d6 (patch)
tree23624c7e140f142af9388b636ff75a232aa4a312
parentaae1df481432c4ea162641e5ff5fdc5c385afd62 (diff)
downloadmana-c4a46650d7416b63a6fdcb4b2791839d15ca73d6.tar.gz
mana-c4a46650d7416b63a6fdcb4b2791839d15ca73d6.tar.bz2
mana-c4a46650d7416b63a6fdcb4b2791839d15ca73d6.tar.xz
mana-c4a46650d7416b63a6fdcb4b2791839d15ca73d6.zip
Fixed a crash that I caused earlier when I was fixing compiler warnings. Caused
by adding a new destructor.
-rw-r--r--src/text.cpp11
-rw-r--r--src/text.h2
2 files changed, 1 insertions, 12 deletions
diff --git a/src/text.cpp b/src/text.cpp
index 7967b56f..545c1c0e 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -100,14 +100,3 @@ void FlashText::draw(Graphics *graphics, int xOff, int yOff)
}
Text::draw(graphics, xOff, yOff);
}
-
-FlashText::~FlashText()
-{
- mTime = 0;
- textManager->removeText(this);
- if (--mInstances == 0)
- {
- delete textManager;
- textManager = 0;
- }
-}
diff --git a/src/text.h b/src/text.h
index 67bb23ae..a370771d 100644
--- a/src/text.h
+++ b/src/text.h
@@ -80,7 +80,7 @@ class FlashText : public Text
/**
* Remove the text from the screen
*/
- virtual ~FlashText();
+ virtual ~FlashText() {}
/**
* Flash the text for so many refreshes