summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2008-10-23 12:30:04 +0000
committerIra Rice <irarice@gmail.com>2008-10-23 12:30:04 +0000
commitba4a95460650b93deca7b7dcff6775f013b73119 (patch)
treeb18923f39a5ca4acf35f5db74cf9d0600226b741
parent5b70e7729229317acfd1b8f79e8eb1b90870827b (diff)
downloadmana-ba4a95460650b93deca7b7dcff6775f013b73119.tar.gz
mana-ba4a95460650b93deca7b7dcff6775f013b73119.tar.bz2
mana-ba4a95460650b93deca7b7dcff6775f013b73119.tar.xz
mana-ba4a95460650b93deca7b7dcff6775f013b73119.zip
A few more compiler warnings fixed.
-rw-r--r--src/gui/minimap.cpp6
-rw-r--r--src/gui/viewport.cpp2
-rw-r--r--src/recorder.h2
-rw-r--r--src/text.h4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 1f3a903c..8640fdb0 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -108,11 +108,11 @@ void Minimap::draw(gcn::Graphics *graphics)
continue;
}
- int offset = (dotSize - 1) * mProportion;
+ int offset = (dotSize - 1) * (int) mProportion;
graphics->fillRectangle(gcn::Rectangle(
- (being->mX * mProportion) + getPadding() - offset,
- (being->mY * mProportion) + getTitleBarHeight() - offset,
+ (being->mX * (int) mProportion) + getPadding() - offset,
+ (being->mY * (int) mProportion) + getTitleBarHeight() - offset,
dotSize, dotSize));
}
}
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 95e0d2b6..f6361ef7 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -259,7 +259,7 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
// Draw names
if (textManager)
{
- textManager->draw(graphics, mPixelViewX, mPixelViewY);
+ textManager->draw(graphics, (int) mPixelViewX, (int) mPixelViewY);
}
// Draw player speech, and emotion sprite as needed
diff --git a/src/recorder.h b/src/recorder.h
index de8e7f3e..75d86f88 100644
--- a/src/recorder.h
+++ b/src/recorder.h
@@ -41,7 +41,7 @@ class Recorder : public ButtonBoxListener
void help(const std::string &args) const;
void buttonBoxRespond();
bool isRecording() const {return mStream;}
- ~Recorder();
+ virtual ~Recorder();
private:
ChatWindow *mChat;
std::ofstream mStream;
diff --git a/src/text.h b/src/text.h
index 0de495e0..67bb23ae 100644
--- a/src/text.h
+++ b/src/text.h
@@ -49,7 +49,7 @@ class Text
/**
* Remove the text from the screen
*/
- ~Text();
+ virtual ~Text();
/**
* Draws the text
@@ -80,7 +80,7 @@ class FlashText : public Text
/**
* Remove the text from the screen
*/
- ~FlashText();
+ virtual ~FlashText();
/**
* Flash the text for so many refreshes