summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-06-23 01:05:14 +0300
committerAndrei Karas <akaras@inbox.ru>2012-06-23 01:44:22 +0300
commit4946dbcd3a3bc2006d2906acfdd080e2772c26b9 (patch)
tree81bae06f0ea2cf6d8f8d14e48461599c2dab6cc4 /src
parentffcf1df72849711b23ff1d184df69f01826edba9 (diff)
downloadplus-4946dbcd3a3bc2006d2906acfdd080e2772c26b9.tar.gz
plus-4946dbcd3a3bc2006d2906acfdd080e2772c26b9.tar.bz2
plus-4946dbcd3a3bc2006d2906acfdd080e2772c26b9.tar.xz
plus-4946dbcd3a3bc2006d2906acfdd080e2772c26b9.zip
Fix code style.
Diffstat (limited to 'src')
-rw-r--r--src/gui/inventorywindow.cpp2
-rw-r--r--src/resources/resourcemanager.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index ccfb12d8a..0db48cbb8 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -33,6 +33,7 @@
#include "gui/gui.h"
#include "gui/itemamountwindow.h"
+#include "gui/outfitwindow.h"
#include "gui/setup.h"
#include "gui/sdlinput.h"
#include "gui/shopwindow.h"
@@ -258,7 +259,6 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
{
if (event.getId() == "outfit")
{
- extern Window *outfitWindow;
if (outfitWindow)
{
outfitWindow->setVisible(!outfitWindow->isVisible());
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 16214661c..0e755edf7 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -798,7 +798,7 @@ void ResourceManager::delayedLoad()
void ResourceManager::removeDelayLoad(AnimationDelayLoad *delayedLoad)
{
- for(DelayedAnimIter it = mDelayedAnimations.begin(),
+ for (DelayedAnimIter it = mDelayedAnimations.begin(),
it_end = mDelayedAnimations.end(); it != it_end; ++ it)
{
if (*it == delayedLoad)