From ed6e43cbbe1e9a93fb58eccbbec1d377f094d73e Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 29 Aug 2006 21:13:23 +0000
Subject: Updated NEWS file and made getAll return a reference instead of a
pointer.
---
src/beingmanager.cpp | 4 ++--
src/beingmanager.h | 2 +-
src/engine.cpp | 4 ++--
src/gui/minimap.cpp | 4 ++--
src/map.cpp | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
(limited to 'src')
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index 10123d06..25edeb24 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -119,9 +119,9 @@ Being* BeingManager::findBeing(Uint16 x, Uint16 y, Being::Type type)
return (i == mBeings.end()) ? NULL : *i;
}
-Beings* BeingManager::getAll()
+Beings& BeingManager::getAll()
{
- return &mBeings;
+ return mBeings;
}
void BeingManager::logic()
diff --git a/src/beingmanager.h b/src/beingmanager.h
index bb6fc99b..cfaf7fbf 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -71,7 +71,7 @@ class BeingManager
/**
* Returns the whole list of beings
*/
- Beings* getAll();
+ Beings& getAll();
/**
* Logic.
diff --git a/src/engine.cpp b/src/engine.cpp
index 557b5d7e..868454d4 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -275,8 +275,8 @@ void Engine::draw(Graphics *graphics)
}
// Draw player nickname, speech, and emotion sprite as needed
- 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++)
{
(*i)->drawSpeech(graphics, -(int)view_x, -(int)view_y);
(*i)->drawName(graphics, -(int)view_x, -(int)view_y);
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index db6d4f15..69c5eb6e 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -76,10 +76,10 @@ void Minimap::draw(gcn::Graphics *graphics)
mMapImage, getPadding(), getTitleBarHeight());
}
- Beings *beings = beingManager->getAll();
+ Beings &beings = beingManager->getAll();
BeingIterator bi;
- for (bi = beings->begin(); bi != beings->end(); bi++)
+ for (bi = beings.begin(); bi != beings.end(); bi++)
{
Being *being = (*bi);
int dotSize = 1;
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;
--
cgit v1.2.3-70-g09d2