summaryrefslogtreecommitdiff
path: root/src/resources/spritedef.h
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2009-01-15 11:06:32 -0700
committerIra Rice <irarice@gmail.com>2009-01-15 11:06:32 -0700
commit10a9dbacd9334caede10f1b21d42cdf7e1efcd03 (patch)
treedef2baead68de5a9ccc842e25b3cdcfe9a638c9b /src/resources/spritedef.h
parente7f4e78f76972ca3882b9d2763ae9cab31675d3a (diff)
downloadmana-10a9dbacd9334caede10f1b21d42cdf7e1efcd03.tar.gz
mana-10a9dbacd9334caede10f1b21d42cdf7e1efcd03.tar.bz2
mana-10a9dbacd9334caede10f1b21d42cdf7e1efcd03.tar.xz
mana-10a9dbacd9334caede10f1b21d42cdf7e1efcd03.zip
Style cleanups throughout most of the code. Splitting function type from
the function names should no longer be around. Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src/resources/spritedef.h')
-rw-r--r--src/resources/spritedef.h23
1 files changed, 8 insertions, 15 deletions
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 4b712340..033de6cd 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -103,22 +103,19 @@ class SpriteDef : public Resource
/**
* Loads an action element.
*/
- void
- loadAction(xmlNodePtr node, int variant_offset);
+ void loadAction(xmlNodePtr node, int variant_offset);
/**
* Loads an animation element.
*/
- void
- loadAnimation(xmlNodePtr animationNode,
- Action *action, ImageSet *imageSet,
- int variant_offset);
+ void loadAnimation(xmlNodePtr animationNode,
+ Action *action, ImageSet *imageSet,
+ int variant_offset);
/**
* Include another sprite into this one.
*/
- void
- includeSprite(xmlNodePtr includeNode);
+ void includeSprite(xmlNodePtr includeNode);
/**
* Complete missing actions by copying existing ones.
@@ -129,21 +126,17 @@ class SpriteDef : public Resource
* When there are no animations defined for the action "complete", its
* animations become a copy of those of the action "with".
*/
- void
- substituteAction(SpriteAction complete, SpriteAction with);
+ void substituteAction(SpriteAction complete, SpriteAction with);
/**
* Converts a string into a SpriteAction enum.
*/
- static SpriteAction
- makeSpriteAction(const std::string &action);
+ static SpriteAction makeSpriteAction(const std::string &action);
/**
* Converts a string into a SpriteDirection enum.
*/
- static SpriteDirection
- makeSpriteDirection(const std::string &direction);
-
+ static SpriteDirection makeSpriteDirection(const std::string &direction);
typedef std::map<std::string, ImageSet*> ImageSets;
typedef ImageSets::iterator ImageSetIterator;