diff options
| author | Bertram <bertram@cegetel.net> | 2010-03-03 23:36:37 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-03-03 23:36:37 +0100 |
| commit | 8cc31b582f372238ce6bd2c86888d312cf1fe5b2 (patch) | |
| tree | 8db5f864348d08a05b8533c7ede58e76741a98f8 /src/being.h | |
| parent | b1845e9e081df1fc77d9bcbed3ab95792d6ba682 (diff) | |
| parent | d564943867452ad76e6d313a28870e640715dded (diff) | |
| download | mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.gz mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.bz2 mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.xz mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Conflicts:
src/being.cpp
Diffstat (limited to 'src/being.h')
| -rw-r--r-- | src/being.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/being.h b/src/being.h index 5140717c..ff21825c 100644 --- a/src/being.h +++ b/src/being.h @@ -648,12 +648,11 @@ class Being : public Sprite, public ConfigListener Vector mDest; /**< destination coordinates. */ /** - * Check the current position against surrounding - * blocking tiles, and correct the position offset within - * tile when needed. + * Check the current position against surrounding blocking tiles, and + * correct the position offset within tile when needed. */ - Position checkNodeOffsets(Position position); - Position checkNodeOffsets(int x, int y) + Position checkNodeOffsets(const Position &position) const; + Position checkNodeOffsets(int x, int y) const { return checkNodeOffsets(Position(x, y)); } private: |