diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
commit | 382067b05c4fe97bcf0da0143405375ec295f7c6 (patch) | |
tree | f668cd2595ac0c85f0942f88729d3ff1956676fa /src/resources/spritedef.cpp | |
parent | ee8191705826d978b7793497fdd307536c709bff (diff) | |
parent | 9b329556e748050c4300174e9bdc72b15e5b8cc5 (diff) | |
download | plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.gz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.bz2 plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.xz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.zip |
Merge branch 'master' into stable
Diffstat (limited to 'src/resources/spritedef.cpp')
-rw-r--r-- | src/resources/spritedef.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index e37aa1aa8..5265a1a96 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -493,12 +493,16 @@ void SpriteDef::addAction(const unsigned hp, const std::string &name, (*mActions[hp])[name] = action; } -bool SpriteDef::addSequence(const int start, const int end, const int delay, - const int offsetX, const int offsetY, +bool SpriteDef::addSequence(const int start, + const int end, + const int delay, + const int offsetX, + const int offsetY, const int variant_offset, - int repeat, const int rand, + int repeat, + const int rand, const ImageSet *const imageSet, - Animation *const animation) const + Animation *const animation) { if (!imageSet || !animation) return true; |