diff options
| -rw-r--r-- | src/gui/widgets/avatarlistbox.cpp | 3 | ||||
| -rw-r--r-- | src/localplayer.h | 12 | ||||
| -rw-r--r-- | src/resources/mapreader.cpp | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index d16388837..8ad6fff2e 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -345,7 +345,8 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event) Avatar *ava = model->getAvatarAt(selected); if (map && ava) { - MapItem *mapItem = map->findPortalXY(ava->getX(), ava->getY()); + MapItem *mapItem = map->findPortalXY( + ava->getX(), ava->getY()); viewport->showPopup(mapItem); } break; diff --git a/src/localplayer.h b/src/localplayer.h index b20a89786..e48afff12 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -453,12 +453,16 @@ class LocalPlayer : public Being, public ActorSpriteListener, { return mAttackMobsSet.find(name) != mAttackMobsSet.end(); } bool isInPriorityAttackList(const std::string &name) - { return mPriorityAttackMobsSet.find(name) - != mPriorityAttackMobsSet.end(); } + { + return mPriorityAttackMobsSet.find(name) + != mPriorityAttackMobsSet.end(); + } bool isInIgnoreAttackList(const std::string &name) - { return mIgnoreAttackMobsSet.find(name) - != mIgnoreAttackMobsSet.end(); } + { + return mIgnoreAttackMobsSet.find(name) + != mIgnoreAttackMobsSet.end(); + } /* bool isInAttackOrIgnoreList(const std::string &name) diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 51e1741f2..818968621 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -472,7 +472,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map) xmlNodeGetContent(dataChild)); if (!charStart) { - delete charData; + delete[] charData; return; } |