summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-11-14 21:21:57 +0300
committerAndrei Karas <akaras@inbox.ru>2011-11-14 21:21:57 +0300
commitbcf7e61d6dd87164d79a211cbda1378e1ddc77bd (patch)
tree40ca82a55dfd04015ddc8134c4e5f97fa98b31c1
parentd5893e9326a529bcba55185024a9373a8d4096ba (diff)
downloadplus-bcf7e61d6dd87164d79a211cbda1378e1ddc77bd.tar.gz
plus-bcf7e61d6dd87164d79a211cbda1378e1ddc77bd.tar.bz2
plus-bcf7e61d6dd87164d79a211cbda1378e1ddc77bd.tar.xz
plus-bcf7e61d6dd87164d79a211cbda1378e1ddc77bd.zip
Fix code style.
-rw-r--r--src/being.cpp2
-rw-r--r--src/gui/equipmentwindow.cpp9
-rw-r--r--src/particlecontainer.h2
3 files changed, 5 insertions, 8 deletions
diff --git a/src/being.cpp b/src/being.cpp
index 73675318d..9d731d2c9 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -2201,7 +2201,7 @@ void Being::recalcSpritesOrder()
= itemReplacer.begin();
std::map<int, int>::const_iterator repIt_end
= itemReplacer.end();
- for (;repIt != repIt_end; ++ repIt)
+ for (; repIt != repIt_end; ++ repIt)
{
for (unsigned slot2 = 0; slot2 < sz; slot2 ++)
{
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index fbd92f931..cb3ace0c7 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -187,13 +187,10 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
}
}
}
- else
+ else if (box->image)
{
- if (box->image)
- {
- g->drawImage(box->image, box->x + BOX_X_PAD,
- box->y + BOX_Y_PAD);
- }
+ g->drawImage(box->image, box->x + BOX_X_PAD,
+ box->y + BOX_Y_PAD);
}
}
}
diff --git a/src/particlecontainer.h b/src/particlecontainer.h
index 937c4dd63..2219bd67c 100644
--- a/src/particlecontainer.h
+++ b/src/particlecontainer.h
@@ -45,7 +45,7 @@ public:
* delParent means that the destructor should also free the parent.
*/
ParticleContainer(ParticleContainer *parent = nullptr,
- bool delParent = true);
+ bool delParent = true);
virtual ~ParticleContainer();