summaryrefslogtreecommitdiff
path: root/src/animatedsprite.cpp
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2008-10-10 17:48:27 +0000
committerIra Rice <irarice@gmail.com>2008-10-10 17:48:27 +0000
commit7729faaadff2e6f92d24f43e52d085f4b11be315 (patch)
tree282a8dd26928a0b71ee0262ff6c9f0e491708026 /src/animatedsprite.cpp
parent8d27447b01407d6605b1fed89fcd556572d8cfca (diff)
downloadmana-client-7729faaadff2e6f92d24f43e52d085f4b11be315.tar.gz
mana-client-7729faaadff2e6f92d24f43e52d085f4b11be315.tar.bz2
mana-client-7729faaadff2e6f92d24f43e52d085f4b11be315.tar.xz
mana-client-7729faaadff2e6f92d24f43e52d085f4b11be315.zip
Did a little bit of code cleanup (mostly from TMW changes) as well as
properly implemented line wrapping. Now, there are no more visual artifacts for speech boxes, and it always chooses the most optimal box size (which required that npc_text use it also. Do any other gui classes use the textbox class?).
Diffstat (limited to 'src/animatedsprite.cpp')
-rw-r--r--src/animatedsprite.cpp16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index dd43e0f1..34ea60f4 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -195,23 +195,11 @@ AnimatedSprite::setDirection(SpriteDirection direction)
int
AnimatedSprite::getWidth() const
{
- if (mFrame)
- {
- return mFrame->image->getWidth();
- }
- else {
- return 0;
- }
+ return mframe ? mFrame->image->getWidth() : 0;
}
int
AnimatedSprite::getHeight() const
{
- if (mFrame)
- {
- return mFrame->image->getHeight();
- }
- else {
- return 0;
- }
+ return mFrame ? mFrame->image->getHeight() : 0;
}