diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-12-14 18:03:19 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-12-14 18:03:19 +0100 |
commit | 18f418c5cbd169be1b8e65c823e0b07d2d8db197 (patch) | |
tree | ad98ff929cf43690acb80f69e317fb5dcb8ff4f3 /src/being.h | |
parent | 69d62451a7a582e3906a7c9328ae14e4bba5ccfa (diff) | |
download | mana-18f418c5cbd169be1b8e65c823e0b07d2d8db197.tar.gz mana-18f418c5cbd169be1b8e65c823e0b07d2d8db197.tar.bz2 mana-18f418c5cbd169be1b8e65c823e0b07d2d8db197.tar.xz mana-18f418c5cbd169be1b8e65c823e0b07d2d8db197.zip |
Code reformatting
I wish I had never fallen for this weird style, and I hope removing it
will prevent others from introducing new code like this. :-)
(cherry picked from eAthena branch, commit
68760426532b9ca4c6939d7a7b8faa1586ee82e0)
Conflicts:
src/being.cpp
src/being.h
src/gui/tabbedcontainer.cpp
src/particle.cpp
src/particle.h
Diffstat (limited to 'src/being.h')
-rw-r--r-- | src/being.h | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/src/being.h b/src/being.h index 9bf88d82..f9e6c58f 100644 --- a/src/being.h +++ b/src/being.h @@ -153,28 +153,25 @@ class Being : public Sprite * * @param amount The amount of damage. */ - virtual void - takeDamage(int amount); + virtual void takeDamage(int amount); /** * Handles an attack of another being by this being. */ - virtual void - handleAttack(); + virtual void handleAttack(); /** * Returns the name of the being. */ - const std::string& - getName() const { return mName; } + const std::string &getName() const + { return mName; } /** * Sets the name for the being. * * @param name The name that should appear. */ - void - setName(const std::string &name) { mName = name; } + void setName(const std::string &name) { mName = name; } /** * Sets the gender for this being. @@ -206,32 +203,28 @@ class Being : public Sprite /** * Sets visible equipments for this being. */ - virtual void - setSprite(int slot, int id, const std::string &color = ""); + virtual void setSprite(int slot, int id, + const std::string &color = ""); /** * Performs being logic. */ - virtual void - logic(); + virtual void logic(); /** * Draws the speech text above the being. */ - void - drawSpeech(Graphics* graphics, int offsetX, int offsetY); + void drawSpeech(Graphics* graphics, int offsetX, int offsetY); /** * Draws the emotion picture above the being. */ - void - drawEmotion(Graphics *graphics, int offsetX, int offsetY); + void drawEmotion(Graphics *graphics, int offsetX, int offsetY); /** * Draws the name text below the being. */ - virtual void - drawName(Graphics *, int, int) {}; + virtual void drawName(Graphics *, int, int) {}; /** * Returns the type of the being. @@ -252,14 +245,12 @@ class Being : public Sprite /** * Gets the being id. */ - Uint16 - getId() const { return mId; } + Uint16 getId() const { return mId; } /** * Sets the sprite id. */ - void - setId(Uint16 id) { mId = id; } + void setId(Uint16 id) { mId = id; } /** * Sets the map the being is on @@ -269,8 +260,7 @@ class Being : public Sprite /** * Sets the current action. */ - virtual void - setAction(Action action, int attackType = 0); + virtual void setAction(Action action, int attackType = 0); /** * Gets the current action. |