summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-01-29 18:17:21 +0300
committerAndrei Karas <akaras@inbox.ru>2012-01-29 18:17:21 +0300
commit9ae83b4bb267c032f9499e80bc6b3bcd9fb37e71 (patch)
treef7d02f22a9d182aa77e745857033f57f0394a7d2
parentc16e6af9d3b0390dbc3947d3376f4ca4ae1f5fc5 (diff)
downloadmanaverse-9ae83b4bb267c032f9499e80bc6b3bcd9fb37e71.tar.gz
manaverse-9ae83b4bb267c032f9499e80bc6b3bcd9fb37e71.tar.bz2
manaverse-9ae83b4bb267c032f9499e80bc6b3bcd9fb37e71.tar.xz
manaverse-9ae83b4bb267c032f9499e80bc6b3bcd9fb37e71.zip
Fix code style.
-rw-r--r--src/gui/widgets/vertcontainer.h2
-rw-r--r--src/mumblemanager.cpp1
-rw-r--r--src/net/inventoryhandler.h2
-rw-r--r--src/net/manaserv/specialhandler.cpp4
-rw-r--r--src/net/messagein.cpp4
5 files changed, 6 insertions, 7 deletions
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index 9460c837e..b4e43d31d 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -40,7 +40,7 @@ class VertContainer : public Container, public gcn::WidgetListener
int leftSpacing = 0);
virtual void add2(gcn::Widget *widget, bool resizable,
- int spacing = -1);
+ int spacing = -1);
virtual void add1(gcn::Widget *widget, int spacing = -1);
diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp
index 766f4085e..14ca7d527 100644
--- a/src/mumblemanager.cpp
+++ b/src/mumblemanager.cpp
@@ -78,7 +78,6 @@ void MumbleManager::init()
#if defined BSD4_4
return;
#endif
-
if (mLinkedMem || !config.getBoolValue("enableMumble"))
return;
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index 45f7c3028..642d6f1c1 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -58,7 +58,7 @@ class InventoryHandler
//void changeCart() = 0;
virtual void moveItem2(int source, int slot, int amount,
- int destination) = 0;
+ int destination) = 0;
// TODO: fix/remove me
virtual size_t getSize(int type) const = 0;
diff --git a/src/net/manaserv/specialhandler.cpp b/src/net/manaserv/specialhandler.cpp
index 73fa864a3..c168afd7c 100644
--- a/src/net/manaserv/specialhandler.cpp
+++ b/src/net/manaserv/specialhandler.cpp
@@ -59,8 +59,8 @@ void SpecialHandler::useBeing(int id A_UNUSED, int level A_UNUSED,
// TODO
}
-void SpecialHandler::usePos(int id A_UNUSED, int level A_UNUSED, int x A_UNUSED,
- int y A_UNUSED)
+void SpecialHandler::usePos(int id A_UNUSED, int level A_UNUSED,
+ int x A_UNUSED, int y A_UNUSED)
{
// TODO
}
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 6efc3ddfe..0547ed337 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -264,10 +264,10 @@ unsigned char *MessageIn::readBytes(int length)
#ifdef ENABLEDEBUGLOG
std::string str;
- for (int f = 0;f < length; f ++)
+ for (int f = 0; f < length; f ++)
str += strprintf ("%02x", (unsigned)buf[f]);
str += " ";
- for (int f = 0;f < length; f ++)
+ for (int f = 0; f < length; f ++)
{
if (buf[f])
str += strprintf ("%c", buf[f]);