4 files changed, 2 insertions, 12 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 7e283bd0..5c8b1d8b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1530,7 +1530,6 @@ void do_parse()
                     MessageOut outMsg;
                     outMsg.writeShort(CMSG_MAP_LOADED);
                     writeSet(2);
-                    flush();
                 }
                 break;
 
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 6069b768..d4c91d19 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -247,7 +247,6 @@ void TradeWindow::tradeItem(Item *item, int quantity)
     outMsg.writeShort(item->getInvIndex());
     outMsg.writeLong(quantity);
     writeSet(8);
-    flush();
 }
 
 void TradeWindow::mouseClick(int x, int y, int button, int count)
@@ -319,7 +318,6 @@ void TradeWindow::action(const std::string &eventId)
         MessageOut outMsg;
         outMsg.writeShort(CMSG_TRADE_CANCEL_REQUEST);
         writeSet(2);
-        flush();
     }
     else if (eventId == "ok")
     {
@@ -336,7 +334,6 @@ void TradeWindow::action(const std::string &eventId)
             outMsg.writeShort(0);
             outMsg.writeLong(tempInt);
             writeSet(8);
-            flush();
         } else {
             moneyField->setText("");
         }
@@ -344,13 +341,11 @@ void TradeWindow::action(const std::string &eventId)
         MessageOut outMsg;
         outMsg.writeShort(CMSG_TRADE_ADD_COMPLETE);
         writeSet(2);
-        flush();
     }
     else if (eventId == "trade")
     {
         MessageOut outMsg;
         outMsg.writeShort(CMSG_TRADE_OK);
         writeSet(2);
-        flush();
     }
 }
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 81ae885c..fe410ece 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -88,7 +88,7 @@ UpdaterWindow::UpdaterWindow():
     // That commented line causes problems if the client had a false value for an update host
     // in its config file.
     // The update host, unlike the home dir, isn't dynamically set at the start of the client.
-    //mUpdateHost = config.getValue("updatehost", "themanaworld.org/files");
+    // mUpdateHost = config.getValue("updatehost", "themanaworld.org/files");
     mUpdateHost = "themanaworld.org/files";
     mBasePath = config.getValue("homeDir", ".");
 
@@ -195,7 +195,7 @@ int UpdaterWindow::updateProgress(void *ptr,
     float progress = dn / dt;
     UpdaterWindow *uw = reinterpret_cast<UpdaterWindow *>(ptr);
 
-    if (progress < 0)    progress = 0.0f;
+    if (progress < 0) progress = 0.0f;
     if (progress > 1) progress = 1.0f;
 
     std::stringstream progressString;
diff --git a/src/inventory.cpp b/src/inventory.cpp
index d7632737..f85e12ef 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -99,7 +99,6 @@ int Inventory::useItem(Item *item)
     outMsg.writeLong(item->getId());
     // Note: id is dest of item, usually player_node->account_ID ??
     writeSet(8);
-    flush();
     return 0;
 }
 
@@ -111,7 +110,6 @@ int Inventory::dropItem(Item *item, int quantity)
     outMsg.writeShort(item->getInvIndex());
     outMsg.writeShort(quantity);
     writeSet(6);
-    flush();
     return 0;
 }
 
@@ -122,7 +120,6 @@ void Inventory::equipItem(Item *item)
     outMsg.writeShort(item->getInvIndex());
     outMsg.writeShort(0);
     writeSet(6);
-    flush();
 }
 
 void Inventory::unequipItem(Item *item)
@@ -131,7 +128,6 @@ void Inventory::unequipItem(Item *item)
     outMsg.writeShort(CMSG_PLAYER_UNEQUIP);
     outMsg.writeShort(item->getInvIndex());
     writeSet(4);
-    flush();
 
     // Tidy equipment directly to avoid weapon still shown bug, by instance
     Equipment::getInstance()->removeEquipment(item);