- Timestamp:
- Mar 23, 2009, 12:44:10 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/miniprojects/src/orxonox/objects/gametypes/Gametype.cc
r2818 r2820 44 44 #include "objects/worldentities/Camera.h" 45 45 46 #include "network/Host.h"47 48 46 namespace orxonox 49 47 { … … 105 103 this->addBots(this->numberOfBots_); 106 104 107 COUT(0) << "game started" << std::endl;108 105 this->gtinfo_.bStarted_ = true; 109 106 … … 113 110 void Gametype::end() 114 111 { 115 COUT(0) << "game ended" << std::endl;116 112 this->gtinfo_.bEnded_ = true; 117 113 } … … 120 116 { 121 117 this->players_[player].state_ = PlayerState::Joined; 122 123 std::string message = player->getName() + " entered the game"; 124 COUT(0) << message << std::endl; 125 Host::Broadcast(message); 126 } 127 128 void Gametype::playerLeft(PlayerInfo* player) 118 } 119 120 bool Gametype::playerLeft(PlayerInfo* player) 129 121 { 130 122 std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player); … … 132 124 { 133 125 this->players_.erase(it); 134 135 std::string message = player->getName() + " left the game"; 136 COUT(0) << message << std::endl; 137 Host::Broadcast(message); 138 } 126 return true; 127 } 128 return false; 139 129 } 140 130 … … 147 137 } 148 138 149 voidGametype::playerChangedName(PlayerInfo* player)139 bool Gametype::playerChangedName(PlayerInfo* player) 150 140 { 151 141 if (this->players_.find(player) != this->players_.end()) … … 153 143 if (player->getName() != player->getOldName()) 154 144 { 155 std::string message = player->getOldName() + " changed name to " + player->getName(); 156 COUT(0) << message << std::endl; 157 Host::Broadcast(message); 158 } 159 } 145 return true; 146 } 147 } 148 return false; 160 149 } 161 150 … … 201 190 void Gametype::pawnKilled(Pawn* victim, Pawn* killer) 202 191 { 203 if (victim && victim->getPlayer())204 {205 std::string message;206 if (killer)207 {208 if (killer->getPlayer())209 message = victim->getPlayer()->getName() + " was killed by " + killer->getPlayer()->getName();210 else211 message = victim->getPlayer()->getName() + " was killed";212 }213 else214 message = victim->getPlayer()->getName() + " died";215 216 COUT(0) << message << std::endl;217 Host::Broadcast(message);218 }219 220 192 if (victim && victim->getPlayer()) 221 193 {
Note: See TracChangeset
for help on using the changeset viewer.