summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/gui/popupmenu.cpp2
-rw-r--r--src/gui/sell.cpp2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d7471a8..e9b6a505 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2005-09-14 Björn Steinbrink <B.Steinbrink@gmx.de>
+ * src/gui/popupmenu.cpp, src/gui/sell.cpp: Use cassert instead of
+ assert.h.
+ * src/net/network.cpp: Add missing cassert header, remove some unused
+ headers.
* src/net/messagein.cpp: Add missing cassert header.
* src/being.cpp, src/being.h, src/game.cpp: Made Being::setDamage
accept a short instead of a string.
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 3ea3e141..6a88cdfd 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -23,7 +23,7 @@
#include "popupmenu.h"
-#include <assert.h>
+#include <cassert>
#include <iostream>
#include <guichan/focushandler.hpp>
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index b6cbe5df..7c030eb1 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -23,7 +23,7 @@
#include "sell.h"
-#include <assert.h>
+#include <cassert>
#include <sstream>
#include <guichan/widgets/label.hpp>