diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-12-14 17:18:04 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-12-14 17:18:04 +0300 |
commit | 36de2c64d6bba077775360c9c0d681f0a096ffc3 (patch) | |
tree | e505ba9337b4eabb73d4d37cdc15d6e7c1f91727 /src/being/being.cpp | |
parent | d9a77eb8ac5d507665cbf8b20f5d8187148ebfd1 (diff) | |
download | plus-36de2c64d6bba077775360c9c0d681f0a096ffc3.tar.gz plus-36de2c64d6bba077775360c9c0d681f0a096ffc3.tar.bz2 plus-36de2c64d6bba077775360c9c0d681f0a096ffc3.tar.xz plus-36de2c64d6bba077775360c9c0d681f0a096ffc3.zip |
chnage return values for draw functions from bool to void.
Diffstat (limited to 'src/being/being.cpp')
-rw-r--r-- | src/being/being.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 75a7b0bb9..8990ec339 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -2248,19 +2248,16 @@ void Being::talkTo() const Net::getNpcHandler()->talk(mId); } -bool Being::draw(Graphics *const graphics, +void Being::draw(Graphics *const graphics, const int offsetX, const int offsetY) const { - bool res = true; if (!mErased) { const int px = getActorX() + offsetX; const int py = getActorY() + offsetY; ActorSprite::draw1(graphics, px, py); - res = drawSpriteAt(graphics, px, py); + drawSpriteAt(graphics, px, py); } - - return res; } void Being::drawSprites(Graphics *const graphics, @@ -2298,13 +2295,13 @@ void Being::drawSpritesSDL(Graphics *const graphics, } } -bool Being::drawSpriteAt(Graphics *const graphics, +void Being::drawSpriteAt(Graphics *const graphics, const int x, const int y) const { - bool res = CompoundSprite::draw(graphics, x, y); + CompoundSprite::draw(graphics, x, y); if (!userPalette) - return res; + return; if (mHighlightMapPortals && mMap && mSubType == 45 && !mMap->getHasWarps()) { @@ -2365,7 +2362,6 @@ bool Being::drawSpriteAt(Graphics *const graphics, y + mapTileSize - 6 + mInfo->getHpBarOffsetY(), 2 * 50, 4); } - return res; } void Being::drawHpBar(Graphics *const graphics, const int maxHP, const int hp, |