summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2009-07-20 09:15:32 +0200
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2009-07-20 09:15:32 +0200
commitddf75478b48173d82f455c99af3894bd0f9018ff (patch)
treee98bf649a1903bc2e07a2c397ebff286fc131bf6
parent6038ee3f4ea80085921f3ecf334884cbe98851bc (diff)
downloadmana-client-ddf75478b48173d82f455c99af3894bd0f9018ff.tar.gz
mana-client-ddf75478b48173d82f455c99af3894bd0f9018ff.tar.bz2
mana-client-ddf75478b48173d82f455c99af3894bd0f9018ff.tar.xz
mana-client-ddf75478b48173d82f455c99af3894bd0f9018ff.zip
Fixed a bunch of compile errors/warnings
Please turn on -Wall, and if you don't notice your warnings, also turn on -Werror.
-rw-r--r--src/gui/statuswindow.cpp6
-rw-r--r--src/localplayer.cpp4
-rw-r--r--src/localplayer.h6
3 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index ed073440..9e5bb3cd 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -415,7 +415,7 @@ AttrDisplay::AttrDisplay(int id, const std::string &name):
mValue->setAlignment(Graphics::CENTER);
mLayout = new LayoutHelper(this);
-};
+}
std::string AttrDisplay::update()
{
@@ -441,7 +441,7 @@ DerDisplay::DerDisplay(int id, const std::string &name):
place(3, 0, mValue, 2);
update();
-};
+}
ChangeDisplay::ChangeDisplay(int id, const std::string &name):
AttrDisplay(id, name), mNeeded(1)
@@ -461,7 +461,7 @@ ChangeDisplay::ChangeDisplay(int id, const std::string &name):
place(7, 0, mPoints);
update();
-};
+}
std::string ChangeDisplay::update()
{
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index cba27569..d20ebcc3 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -895,7 +895,7 @@ void LocalPlayer::setExpNeeded(int value)
statusWindow->update(StatusWindow::EXP);
}
-int LocalPlayer::setMP(int value)
+void LocalPlayer::setMP(int value)
{
mMp = value;
@@ -903,7 +903,7 @@ int LocalPlayer::setMP(int value)
statusWindow->update(StatusWindow::MP);
}
-int LocalPlayer::setMaxMP(int value)
+void LocalPlayer::setMaxMP(int value)
{
mMaxMp = value;
diff --git a/src/localplayer.h b/src/localplayer.h
index 1c57abaf..140d64b4 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -289,19 +289,19 @@ class LocalPlayer : public Player
void setExp(int value);
int getExp() const
- { return mExp, mExpNeeded; }
+ { return mExp; }
void setExpNeeded(int value);
int getExpNeeded() const
{ return mExpNeeded; }
- int setMP(int value);
+ void setMP(int value);
int getMP() const
{ return mMp; }
- int setMaxMP(int value);
+ void setMaxMP(int value);
int getMaxMP() const
{ return mMaxMp; }