Changeset 3099 for code/trunk/src/orxonox/objects/gametypes/Gametype.cc

Timestamp:

May 28, 2009, 1:58:22 AM (15 years ago)

Author:

landauf

Message:

Added Gameplay messages (Announces, Killmessages and Deathmessages)

File:

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

code/trunk/src/orxonox/objects/gametypes/Gametype.cc

@@ -236 +236 @@
 
                 // Reward killer
-                if (killer)
+                if (killer && killer->getPlayer())
                 {
                     std::map<PlayerInfo*, Player>::iterator it = this->players_.find(killer->getPlayer());
                     if (it != this->players_.end())
+                    {
                         it->second.frags_++;
+
+                        if (killer->getPlayer()->getClientID() != CLIENTID_UNKNOWN)
+                            this->gtinfo_.sendKillMessage("You killed " + victim->getPlayer()->getName(), killer->getPlayer()->getClientID());
+                        if (victim->getPlayer()->getClientID() != CLIENTID_UNKNOWN)
+                            this->gtinfo_.sendDeathMessage("You were killed by " + killer->getPlayer()->getName(), victim->getPlayer()->getClientID());
+                    }
                 }