summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-12-23 01:46:27 +0300
committerAndrei Karas <akaras@inbox.ru>2011-12-23 01:46:27 +0300
commit7cff9f7777dcfdaae8cc7b982740131d80ba75c1 (patch)
treefd8ca1c73df99abb881f4b8fed595a367d6652be /src/gui
parenta901facc32f489dbce6f9193f618d9d46a91f32c (diff)
downloadplus-7cff9f7777dcfdaae8cc7b982740131d80ba75c1.tar.gz
plus-7cff9f7777dcfdaae8cc7b982740131d80ba75c1.tar.bz2
plus-7cff9f7777dcfdaae8cc7b982740131d80ba75c1.tar.xz
plus-7cff9f7777dcfdaae8cc7b982740131d80ba75c1.zip
Fix code style and some auto checked errors.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popupmenu.cpp2
-rw-r--r--src/gui/socialwindow.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 15afc7600..283fcb99e 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -367,7 +367,7 @@ void PopupMenu::showPopup(int x, int y, std::vector<ActorSprite*> &beings)
being->getId(), (being->getName()
+ being->getGenderSignWithSpace()).c_str()));
}
- else if(actor->getType() == ActorSprite::FLOOR_ITEM)
+ else if (actor->getType() == ActorSprite::FLOOR_ITEM)
{
FloorItem *floorItem = static_cast<FloorItem*>(actor);
const ItemInfo &info = floorItem->getInfo();
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 2bc8aba9b..72dd2104d 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -848,11 +848,11 @@ public:
std::vector<Avatar*> *avatars = mBeings->getMembers();
- std::vector<Avatar*>::iterator i = avatars->begin();
-
if (!avatars)
return;
+ std::vector<Avatar*>::iterator i = avatars->begin();
+
while (i != avatars->end())
{
Avatar *ava = (*i);