From 37dc13f9a2375c7d6ecccf25f63c607b5bb15928 Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Fri, 26 Aug 2011 00:18:31 +0200
Subject: Added a bit more precision on the conditions used in the
 TriggerArea::update() function.

---
 src/game-server/trigger.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/game-server/trigger.cpp')

diff --git a/src/game-server/trigger.cpp b/src/game-server/trigger.cpp
index 19ca351..c4cec2f 100644
--- a/src/game-server/trigger.cpp
+++ b/src/game-server/trigger.cpp
@@ -52,8 +52,9 @@ void TriggerArea::update()
     std::set<Actor*> insideNow;
     for (BeingIterator i(getMap()->getInsideRectangleIterator(mZone)); i; ++i)
     {
-        //skip garbage
-        if (!(*i) || (*i)->getPublicID() == 0) continue;
+        // Don't deal with unitialized actors.
+        if (!(*i) || !(*i)->isPublicIdValid())
+            continue;
 
         // The BeingIterator returns the mapZones in touch with the rectangle
         // area. On the other hand, the beings contained in the map zones
-- 
cgit