Changeset 8858 for code/trunk/src/orxonox/gametypes/Deathmatch.cc
- Timestamp:
- Aug 23, 2011, 12:45:53 AM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:ignore
-
old new 1 1 build 2 2 codeblocks 3 vs 3 4 dependencies
-
- Property svn:mergeinfo changed
/code/branches/output (added) merged: 8739-8740,8765,8771-8772,8774-8780,8787-8789,8794-8799,8801,8803-8812,8814,8816-8817,8820,8822,8825-8837,8840,8844,8846,8848-8850,8853-8854
- Property svn:ignore
-
code/trunk/src/orxonox/gametypes/Deathmatch.cc
r6417 r8858 30 30 31 31 #include "core/CoreIncludes.h" 32 #include " network/Host.h"32 #include "chat/ChatManager.h" 33 33 #include "infos/PlayerInfo.h" 34 34 #include "worldentities/pawns/Pawn.h" … … 48 48 49 49 std::string message("The match has started!"); 50 COUT(0) << message << std::endl; 51 Host::Broadcast(message); 50 ChatManager::message(message); 52 51 } 53 52 … … 57 56 58 57 std::string message("The match has ended."); 59 COUT(0) << message << std::endl; 60 Host::Broadcast(message); 58 ChatManager::message(message); 61 59 } 62 60 … … 66 64 67 65 const std::string& message = player->getName() + " entered the game"; 68 COUT(0) << message << std::endl; 69 Host::Broadcast(message); 66 ChatManager::message(message); 70 67 } 71 68 … … 77 74 { 78 75 const std::string& message = player->getName() + " left the game"; 79 COUT(0) << message << std::endl; 80 Host::Broadcast(message); 76 ChatManager::message(message); 81 77 } 82 78 … … 91 87 { 92 88 const std::string& message = player->getOldName() + " changed name to " + player->getName(); 93 COUT(0) << message << std::endl; 94 Host::Broadcast(message); 89 ChatManager::message(message); 95 90 } 96 91 … … 113 108 message = victim->getPlayer()->getName() + " died"; 114 109 115 COUT(0) << message << std::endl; 116 Host::Broadcast(message); 110 ChatManager::message(message); 117 111 } 118 112 … … 127 121 { 128 122 const std::string& message = player->getName() + " scores!"; 129 COUT(0) << message << std::endl; 130 Host::Broadcast(message); 123 ChatManager::message(message); 131 124 } 132 125 }
Note: See TracChangeset
for help on using the changeset viewer.