summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2005-07-22 21:06:13 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2005-07-22 21:06:13 +0000
commita9f0bca7aab054aae146a4044a4a904d0c54020b (patch)
treec48c05a687664610e2fcd6f1b5997b6cec120a13
parentce644911919ec3a4f0c93e1f45a58344ebc1f71d (diff)
downloadmana-a9f0bca7aab054aae146a4044a4a904d0c54020b.tar.gz
mana-a9f0bca7aab054aae146a4044a4a904d0c54020b.tar.bz2
mana-a9f0bca7aab054aae146a4044a4a904d0c54020b.tar.xz
mana-a9f0bca7aab054aae146a4044a4a904d0c54020b.zip
Added missing includes and fixed a warning about implicit conversion.
-rw-r--r--src/gui/buy.cpp1
-rw-r--r--src/gui/item_amount.cpp2
-rw-r--r--src/gui/popupmenu.cpp2
-rw-r--r--src/gui/sell.cpp1
4 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 10b66678..86ea764b 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -31,6 +31,7 @@
#include "../net/network.h"
#include <sstream>
+#include <assert.h>
BuyDialog::BuyDialog():
Window("Buy"),
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index 51b67e72..e67992ea 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -134,7 +134,7 @@ void ItemAmountWindow::action(const std::string& eventId)
}
else if (eventId == "Slide")
{
- itemAmountTextBox->setInt(itemAmountSlide->getValue()*inventoryWindow->getItem()->getQuantity());
+ itemAmountTextBox->setInt((int)(itemAmountSlide->getValue()*inventoryWindow->getItem()->getQuantity()));
}
}
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index d47fe340..77f95d2f 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -21,6 +21,8 @@
* $Id$
*/
+#include <assert.h>
+
#include "popupmenu.h"
#include "gui.h"
#include "inventorywindow.h"
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index bc1fe2e8..ae432a43 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -31,6 +31,7 @@
#include "../net/network.h"
#include <sstream>
+#include <assert.h>
SellDialog::SellDialog():
Window("Sell")