diff options
| author | Blue <bluesansdouze@gmail.com> | 2010-01-10 00:28:20 +0100 |
|---|---|---|
| committer | Blue <bluesansdouze@gmail.com> | 2010-01-10 00:28:20 +0100 |
| commit | 4544e23b23fd722aeeeb99f37c7076e09cc037bb (patch) | |
| tree | 4ac8bbb6a27439f9a1ff87dec1a61bd5f01d5452 /src/game-server/trigger.cpp | |
| parent | 9ad132534ada41efd7973f8ef52fe49bee769866 (diff) | |
| parent | 5c5abafd2b0dcbcdeefad625b03732949c56056f (diff) | |
| download | manaserv-4544e23b23fd722aeeeb99f37c7076e09cc037bb.tar.gz manaserv-4544e23b23fd722aeeeb99f37c7076e09cc037bb.tar.bz2 manaserv-4544e23b23fd722aeeeb99f37c7076e09cc037bb.tar.xz manaserv-4544e23b23fd722aeeeb99f37c7076e09cc037bb.zip | |
Merge branch 'master' of ssh://git@gitorious.org/mana/manaserv
Diffstat (limited to 'src/game-server/trigger.cpp')
| -rw-r--r-- | src/game-server/trigger.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game-server/trigger.cpp b/src/game-server/trigger.cpp index 522e0be1..7db53cca 100644 --- a/src/game-server/trigger.cpp +++ b/src/game-server/trigger.cpp @@ -52,6 +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; + if (mZone.contains((*i)->getPosition())) //<-- Why is this additional condition necessary? Shouldn't getInsideRectangleIterator already exclude those outside of the zone? --Crush { insideNow.insert(*i); |