diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-01-25 03:56:27 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-01-25 03:56:27 +0100 |
| commit | 17d2756975a8ff22ecba92c055fa7a7f77d425c6 (patch) | |
| tree | 76aaa104da3ee97b07aec7f2d972f8b8d6239d9a /src/player.cpp | |
| parent | 7e928fc6559e89b64f49aea30d796dbfe75c4912 (diff) | |
| parent | 61040888a373b03cc599750c33186848cae37ef4 (diff) | |
| download | mana-17d2756975a8ff22ecba92c055fa7a7f77d425c6.tar.gz mana-17d2756975a8ff22ecba92c055fa7a7f77d425c6.tar.bz2 mana-17d2756975a8ff22ecba92c055fa7a7f77d425c6.tar.xz mana-17d2756975a8ff22ecba92c055fa7a7f77d425c6.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/player.cpp')
| -rw-r--r-- | src/player.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/player.cpp b/src/player.cpp index 22efc711..ec3b1c1c 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -31,7 +31,6 @@ #include "utils/strprintf.h" -#include "gui/gui.h" #include <iostream> static const int NAME_X_OFFSET = 15; @@ -57,13 +56,12 @@ void Player::setName(const std::string &name) { mName = new FlashText(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET, gcn::Graphics::CENTER, - speechFont, gcn::Color(255, 255, 255)); + gcn::Color(255, 255, 255)); Being::setName(name); } } -void -Player::logic() +void Player::logic() { switch (mAction) { case WALK: @@ -90,14 +88,12 @@ Player::logic() Being::logic(); } -Being::Type -Player::getType() const +Being::Type Player::getType() const { return PLAYER; } -void -Player::flash(int time) +void Player::flash(int time) { if (mName) { |