diff options
| author | Reid <reidyaro@gmail.com> | 2012-01-25 22:05:36 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-01-25 22:05:36 +0100 |
| commit | 8b612abb42853a22c1a9545e2c9280d154646543 (patch) | |
| tree | f466167087c2b2de4b8aa9e6d1d1986f72f84147 /src/animationparticle.cpp | |
| parent | a913dd41df61760de6ece552f941e002251ff54c (diff) | |
| parent | d340b5a27a8f3b05d1764da9c114f5f59bd0cd46 (diff) | |
| download | plus-8b612abb42853a22c1a9545e2c9280d154646543.tar.gz plus-8b612abb42853a22c1a9545e2c9280d154646543.tar.bz2 plus-8b612abb42853a22c1a9545e2c9280d154646543.tar.xz plus-8b612abb42853a22c1a9545e2c9280d154646543.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/animationparticle.cpp')
| -rw-r--r-- | src/animationparticle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp index ef2e0a680..c1bf251af 100644 --- a/src/animationparticle.cpp +++ b/src/animationparticle.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -33,7 +33,7 @@ AnimationParticle::AnimationParticle(Map *map, Animation *animation): { } -AnimationParticle::AnimationParticle(Map *map, xmlNodePtr animationNode, +AnimationParticle::AnimationParticle(Map *map, XmlNodePtr animationNode, const std::string& dyePalettes): ImageParticle(map, nullptr), mAnimation(new SimpleAnimation(animationNode, dyePalettes)) |