summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2008-03-13 12:11:54 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2008-03-13 12:11:54 +0000
commitc6915bd4a4fc4702094e5e6070b62651bb97bfdb (patch)
tree5da49c57d94e481112875b3c6070f82adb7ebca1
parentd2eff88e164b090faf937b0bedec482bdec1c621 (diff)
downloadmana-c6915bd4a4fc4702094e5e6070b62651bb97bfdb.tar.gz
mana-c6915bd4a4fc4702094e5e6070b62651bb97bfdb.tar.bz2
mana-c6915bd4a4fc4702094e5e6070b62651bb97bfdb.tar.xz
mana-c6915bd4a4fc4702094e5e6070b62651bb97bfdb.zip
included cassert header and fixed grammar in a comment.
-rw-r--r--src/map.cpp1
-rw-r--r--src/monster.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/map.cpp b/src/map.cpp
index afa2bcc5..f7b16427 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -25,6 +25,7 @@
#include <algorithm>
#include <queue>
+#include <cassert>
#include "beingmanager.h"
#include "game.h"
diff --git a/src/monster.h b/src/monster.h
index ecf7ad51..bde99ed6 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -62,10 +62,10 @@ class Monster : public Being
getInfo() const;
/**
- * Gets the way the monster is blocked for other objects
+ * Gets the way the monster is blocked by other objects
*/
virtual unsigned char getWalkMask() const
- { return 0x83; } // blocked walls, other monsters and players ( bin 1000 0011)
+ { return 0x83; } // blocked by walls, other monsters and players ( bin 1000 0011)
protected:
/**