summaryrefslogtreecommitdiff
path: root/src/being.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-12-07 20:58:03 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-12-07 20:58:03 +0100
commite5671f8bdc30ac567a535f698c8dcaedd4441340 (patch)
tree70c2d966109e27e40dfd3516145f818af60ce8a0 /src/being.h
parent719e2b02bc6833198d6af2d3c95de96ef95f876d (diff)
downloadmana-e5671f8bdc30ac567a535f698c8dcaedd4441340.tar.gz
mana-e5671f8bdc30ac567a535f698c8dcaedd4441340.tar.bz2
mana-e5671f8bdc30ac567a535f698c8dcaedd4441340.tar.xz
mana-e5671f8bdc30ac567a535f698c8dcaedd4441340.zip
Some code reformatting
Diffstat (limited to 'src/being.h')
-rw-r--r--src/being.h22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/being.h b/src/being.h
index 9390dccd..abbd4c30 100644
--- a/src/being.h
+++ b/src/being.h
@@ -385,8 +385,10 @@ class Being : public Sprite
*
* \param effectId ID of the effect to trigger
*/
- virtual void
- triggerEffect(int effectId) { internalTriggerEffect(effectId, false, true); }
+ virtual void triggerEffect(int effectId)
+ {
+ internalTriggerEffect(effectId, false, true);
+ }
const std::auto_ptr<Equipment> mEquipment;
@@ -420,22 +422,19 @@ class Being : public Sprite
* \param sfx Whether to trigger sound effects
* \param gfx Whether to trigger graphical effects
*/
- void
- internalTriggerEffect(int effectId, bool sfx, bool gfx);
+ void internalTriggerEffect(int effectId, bool sfx, bool gfx);
/**
* Notify self that the stun mode has been updated. Invoked by
* setStunMode if something changed.
*/
- virtual void
- updateStunMode(int oldMode, int newMode);
+ virtual void updateStunMode(int oldMode, int newMode);
/**
* Notify self that a status effect has flipped.
* The new flag is passed.
*/
- virtual void
- updateStatusEffect(int index, bool newStatus);
+ virtual void updateStatusEffect(int index, bool newStatus);
/**
* Handle an update to a status or stun effect
@@ -443,8 +442,7 @@ class Being : public Sprite
* \param The StatusEffect to effect
* \param effectId -1 for stun, otherwise the effect index
*/
- virtual void
- handleStatusEffect(StatusEffect *effect, int effectId);
+ virtual void handleStatusEffect(StatusEffect *effect, int effectId);
Uint32 mId; /**< Unique sprite id */
Uint16 mWalkSpeed; /**< Walking speed */
@@ -462,8 +460,8 @@ class Being : public Sprite
Uint8 mGender;
Uint32 mSpeechTime;
Sint32 mPx, mPy; /**< Pixel coordinates */
- Uint16 mStunMode; /**< Stun mode; zero if not stunned */
- std::set<int> mStatusEffects; /**< set of active status effects */
+ Uint16 mStunMode; /**< Stun mode; zero if not stunned */
+ std::set<int> mStatusEffects; /**< set of active status effects */
std::vector<AnimatedSprite*> mSprites;
std::vector<int> mSpriteIDs;