Changeset 3196 for code/trunk/src/orxonox/overlays/hud/ChatOverlay.cc
- Timestamp:
- Jun 20, 2009, 9:20:47 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/pch (added) merged: 3114-3118,3124-3125,3127-3131,3133,3138-3194
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/overlays/hud/ChatOverlay.cc
r3110 r3196 29 29 #include "ChatOverlay.h" 30 30 31 #include <string> 31 32 #include <OgreTextAreaOverlayElement.h> 32 33 34 #include "util/Convert.h" 35 #include "util/UTFStringConversions.h" 33 36 #include "core/CoreIncludes.h" 34 37 #include "core/ConfigValueIncludes.h" 35 38 #include "core/Executor.h" 36 39 37 #include " network/ClientInformation.h"38 40 #include "tools/Timer.h" 41 #include "objects/infos/PlayerInfo.h" 39 42 #include "PlayerManager.h" 40 #include "objects/infos/PlayerInfo.h"41 #include "overlays/console/InGameConsole.h"42 #include "tools/Timer.h"43 44 #include "util/Convert.h"45 43 46 44 namespace orxonox … … 86 84 } 87 85 88 this->messages_.push_back( InGameConsole::convert2UTF(text));86 this->messages_.push_back(multi_cast<Ogre::UTFString>(text)); 89 87 COUT(0) << "Chat: " << text << std::endl; 90 88
Note: See TracChangeset
for help on using the changeset viewer.