summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-06 19:06:16 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-06 19:06:16 +0300
commit3dea83eeef37e201a3a32d7824377a1a49c73964 (patch)
treeb3767834632dbe02ac54ff8aa8efa05c125af879 /src
parent3b90250bbfc5b1f27b037d7b917063767ad90274 (diff)
downloadManaVerse-3dea83eeef37e201a3a32d7824377a1a49c73964.tar.gz
ManaVerse-3dea83eeef37e201a3a32d7824377a1a49c73964.tar.bz2
ManaVerse-3dea83eeef37e201a3a32d7824377a1a49c73964.tar.xz
ManaVerse-3dea83eeef37e201a3a32d7824377a1a49c73964.zip
Fix code style.
Diffstat (limited to 'src')
-rw-r--r--src/gui/selldialog.cpp4
-rw-r--r--src/map.cpp1
-rw-r--r--src/resources/colordb.cpp1
3 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/selldialog.cpp b/src/gui/selldialog.cpp
index cb4fca993..eea0c86f1 100644
--- a/src/gui/selldialog.cpp
+++ b/src/gui/selldialog.cpp
@@ -78,8 +78,8 @@ void SellDialog::init()
mShopItems = new ShopItems(true);
mShopItemList = new ShopListBox(mShopItems, mShopItems);
- mScrollArea = new ScrollArea(mShopItemList, getOptionBool("showbackground"),
- "sell_background.xml");
+ mScrollArea = new ScrollArea(mShopItemList,
+ getOptionBool("showbackground"), "sell_background.xml");
mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
mSlider = new Slider(1.0);
diff --git a/src/map.cpp b/src/map.cpp
index 7fdb9a1bd..6123332a2 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1124,7 +1124,6 @@ void Map::addExtraLayer()
ss >> x;
ss >> y;
ss >> type1;
- std::vector<int> tokens;
ss >> comment;
while (ss >> buf)
comment += " " + buf;
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index 4828ca388..7f7e0f0db 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -187,7 +187,6 @@ int ColorDB::getHairSize()
std::map <int, ColorDB::ItemColor> *ColorDB::getColorsList(std::string name)
{
- std::map <int, ItemColor> colors;
ColorListsIterator it = mColorLists.find(name);
if (it != mColorLists.end())