Changeset 2447 for code/branches/objecthierarchy2/src/orxonox/objects/gametypes/Gametype.cc

Timestamp:

Dec 14, 2008, 8:13:43 PM (15 years ago)

Author:

landauf

Message:

• Removed directional-light-hack from Scene
• Many changes in Light, works in all game-modes (standalone, dedicated, server and client)
• Fixed a bug which caused clients to not having shadows

There's still a big problem, bug I can't explain it.

File:

• code/branches/objecthierarchy2/src/orxonox/objects/gametypes/Gametype.cc (modified) (1 diff)

code/branches/objecthierarchy2/src/orxonox/objects/gametypes/Gametype.cc

@@ -149 +149 @@
     void Gametype::pawnKilled(Pawn* victim, Pawn* killer)
     {
-        if (victim)
+        if (victim && victim->getPlayer())
         {
             std::map<PlayerInfo*, PlayerState::Enum>::iterator it = this->players_.find(victim->getPlayer());
-            it->second = PlayerState::Dead;
-
-            ControllableEntity* entity = this->defaultControllableEntity_.fabricate(victim->getCreator());
-            if (victim->getCamera())
-            {
-                entity->setPosition(victim->getCamera()->getWorldPosition());
-                entity->setOrientation(victim->getCamera()->getWorldOrientation());
+            if (it != this->players_.end())
+            {
+                it->second = PlayerState::Dead;
+
+                ControllableEntity* entity = this->defaultControllableEntity_.fabricate(victim->getCreator());
+                if (victim->getCamera())
+                {
+                    entity->setPosition(victim->getCamera()->getWorldPosition());
+                    entity->setOrientation(victim->getCamera()->getWorldOrientation());
+                }
+                else
+                {
+                    entity->setPosition(victim->getWorldPosition());
+                    entity->setOrientation(victim->getWorldOrientation());
+                }
+                it->first->startControl(entity);
             }
             else
-            {
-                entity->setPosition(victim->getWorldPosition());
-                entity->setOrientation(victim->getWorldOrientation());
-            }
-            it->first->startControl(entity);
+                COUT(2) << "Warning: Killed Pawn was not in the playerlist" << std::endl;
         }
     }