Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2014-12-24 21:11:43 +0000
committerStijn Buys <ingar@osirion.org>2014-12-24 21:11:43 +0000
commit0c6499e6789db9686bcea3bb3b7f782c2f659eb7 (patch)
tree3ffe09ff82fa1f8ffd27c9b6c522993d854cd649 /src/game/base/npc.cc
parentf330ae5ed3bd73c7b5b582cccde6cdd91d3c6e5b (diff)
Prevent projectiles from hitting the enity that fired it, prevent projectiles from hitting each other.
Diffstat (limited to 'src/game/base/npc.cc')
-rw-r--r--src/game/base/npc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/base/npc.cc b/src/game/base/npc.cc
index f9a600e..d52c612 100644
--- a/src/game/base/npc.cc
+++ b/src/game/base/npc.cc
@@ -307,7 +307,7 @@ void NPC::frame(const unsigned long elapsed)
if (zone() != carrier->zone())
{
set_zone(carrier->zone());
- }
+ }
if (carrier->state() == core::Entity::Destroyed)
{
explode();