summaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-08-29 21:13:23 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-08-29 21:13:23 +0000
commited6e43cbbe1e9a93fb58eccbbec1d377f094d73e (patch)
tree292a6d7176f09453f6aaf5077a8570328ba7acea /src/map.cpp
parent91705f88735b8efdbf263a22ef02c1b87c964b5b (diff)
downloadmana-ed6e43cbbe1e9a93fb58eccbbec1d377f094d73e.tar.gz
mana-ed6e43cbbe1e9a93fb58eccbbec1d377f094d73e.tar.bz2
mana-ed6e43cbbe1e9a93fb58eccbbec1d377f094d73e.tar.xz
mana-ed6e43cbbe1e9a93fb58eccbbec1d377f094d73e.zip
Updated NEWS file and made getAll return a reference instead of a pointer.
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map.cpp b/src/map.cpp
index 027a5440..41282ddd 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -329,8 +329,8 @@ Map::getWalk(int x, int y)
}
// Check for collision with a being
- Beings *beings = beingManager->getAll();
- for (BeingIterator i = beings->begin(); i != beings->end(); i++) {
+ Beings &beings = beingManager->getAll();
+ for (BeingIterator i = beings.begin(); i != beings.end(); i++) {
// job 45 is a portal, they don't collide
if ((*i)->mX == x && (*i)->mY == y && (*i)->mJob != 45) {
return false;