summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-04-29 01:38:41 +0300
committerAndrei Karas <akaras@inbox.ru>2011-04-29 01:38:41 +0300
commit6e190e44b01f5e1780e14e7a60262d3d10e3d48f (patch)
tree4361b31b16caa5721bb548c43366ced35ff8e052
parent8aed49f9c62e7a9a8f94d6189f173815d3834080 (diff)
downloadmv-6e190e44b01f5e1780e14e7a60262d3d10e3d48f.tar.gz
mv-6e190e44b01f5e1780e14e7a60262d3d10e3d48f.tar.bz2
mv-6e190e44b01f5e1780e14e7a60262d3d10e3d48f.tar.xz
mv-6e190e44b01f5e1780e14e7a60262d3d10e3d48f.zip
Fix code style.
-rw-r--r--src/gui/widgets/avatarlistbox.cpp3
-rw-r--r--src/localplayer.h12
-rw-r--r--src/resources/mapreader.cpp2
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;
}