diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 10:50:00 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 10:50:00 +0000 |
| commit | 5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc (patch) | |
| tree | 95684590a32266b28f046475cfa1926c99f67e52 /src/animatedsprite.h | |
| parent | cf36850d2bdda67cb472d938ed58053a92fa6935 (diff) | |
| download | mana-client-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.gz mana-client-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.bz2 mana-client-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.xz mana-client-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.zip | |
Merged revisions 3629-3630 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
(but kept looks in Being class, since eAthena works that way)
........
r3629 | gmelquio | 2007-10-18 21:00:38 +0200 (Thu, 18 Oct 2007) | 1 line
Removed player looks from generic beings. Prevented client termination on missing sprites. Merged weapon-type and attack-type fields for items.
........
r3630 | gmelquio | 2007-10-18 21:30:57 +0200 (Thu, 18 Oct 2007) | 1 line
Fixed changelog message.
........
Diffstat (limited to 'src/animatedsprite.h')
| -rw-r--r-- | src/animatedsprite.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/animatedsprite.h b/src/animatedsprite.h index d77d08f5..a1fbe7a0 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -46,13 +46,13 @@ class AnimatedSprite AnimatedSprite(SpriteDef *sprite); /** - * A convenience constructor, which will request the sprite to animate + * An helper function, which will request the sprite to animate * from the resource manager. * * @param filename the file of the sprite to animate * @param variant the sprite variant */ - AnimatedSprite(const std::string& filename, int variant = 0); + static AnimatedSprite *load(std::string const &filename, int variant = 0); /** * Destructor. |