From 17dcb835103ac05012c5a7eafa8c7702cef53390 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 11 Mar 2013 18:09:33 +0300 Subject: Add some fixes after automatic checks. --- src/gui/socialwindow.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/gui/socialwindow.cpp') diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 6c74f4397..653140e3f 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -766,16 +766,15 @@ public: if (!map) return; - Avatar *ava = nullptr; std::vector::const_iterator i = avatars->begin(); const std::vector::const_iterator i_end = avatars->end(); while (i != i_end) { - ava = (*i); + Avatar *const ava = *i; if (!ava) break; - const MapItem *const item = map->findPortalXY( + const MapItem *const item = map->findPortalXY( ava->getX(), ava->getY()); if (item) { @@ -802,14 +801,12 @@ public: if (!map) return 01; - const Avatar *ava = nullptr; std::vector::const_iterator i = avatars->begin(); const std::vector::const_iterator i_end = avatars->end(); unsigned num = 0; while (i != i_end) { - ava = (*i); - + const Avatar *const ava = *i; if (!ava) break; -- cgit v1.2.3-70-g09d2