summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/trade.cpp5
-rw-r--r--src/gui/updatewindow.cpp4
2 files changed, 2 insertions, 7 deletions
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;