diff options
author | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
---|---|---|
committer | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
commit | 490862919d79369112c75955a9c36ff8a081efd3 (patch) | |
tree | 6fe89466b9c53ba811f298174e6d787bbae71e09 /src/resources/spritedef.h | |
parent | dff814619d63496acd3c4e8730b828b5d4d931fb (diff) | |
parent | d873da3e8e57480016596f714845c1bc7e712e68 (diff) | |
download | manaverse-490862919d79369112c75955a9c36ff8a081efd3.tar.gz manaverse-490862919d79369112c75955a9c36ff8a081efd3.tar.bz2 manaverse-490862919d79369112c75955a9c36ff8a081efd3.tar.xz manaverse-490862919d79369112c75955a9c36ff8a081efd3.zip |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/resources/spritedef.h')
-rw-r--r-- | src/resources/spritedef.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 0490bdcb3..e167cf188 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -176,6 +176,11 @@ class SpriteDef : public Resource void substituteActions(); /** + * Fix bad timeout in last dead action frame + */ + void fixDeadAction(); + + /** * When there are no animations defined for the action "complete", its * animations become a copy of those of the action "with". */ @@ -185,6 +190,8 @@ class SpriteDef : public Resource typedef ImageSets::iterator ImageSetIterator; typedef std::map<std::string, Action*> ActionMap; typedef std::map<unsigned, ActionMap*> Actions; + typedef Actions::const_iterator ActionsConstIter; + typedef Actions::iterator ActionsIter; ImageSets mImageSets; Actions mActions; |