Changeset 6135 for code/branches/presentation2/src/modules

Timestamp:

Nov 24, 2009, 2:17:38 AM (15 years ago)

Author:

landauf

Message:

replaced UTFStringConversions.h by DisplayStringConversions.h which does basically the same but only if OGRE_UNICODE_SUPPORT is true.

this allows us to build orxonox with the latest release of mingw and this also fixes the broken fonts.

Location:

code/branches/presentation2/src/modules/overlays/hud

Files:

• ChatOverlay.cc (modified) (3 diffs)
• ChatOverlay.h (modified) (2 diffs)

code/branches/presentation2/src/modules/overlays/hud/ChatOverlay.cc

@@ -33 +33 @@
 
 #include "util/Convert.h"
-#include "util/UTFStringConversions.h"
+#include "util/DisplayStringConversions.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -86 +86 @@
         }
 
-        this->messages_.push_back(multi_cast<Ogre::UTFString>(text));
+        this->messages_.push_back(multi_cast<Ogre::DisplayString>(text));
         COUT(0) << "Chat: " << text << std::endl;
 
@@ -110 +110 @@
         this->text_->setCaption("");
 
-        for (std::list<Ogre::UTFString>::reverse_iterator it = this->messages_.rbegin(); it != this->messages_.rend(); ++it)
+        for (std::list<Ogre::DisplayString>::reverse_iterator it = this->messages_.rbegin(); it != this->messages_.rend(); ++it)
         {
             this->text_->setCaption(this->text_->getCaption() + "\n" + (*it));

code/branches/presentation2/src/modules/overlays/hud/ChatOverlay.h

@@ -33 +33 @@
 
 #include <list>
-#include <OgreUTFString.h>
+#include <OgreOverlayElement.h>
 
 #include "network/ChatListener.h"
@@ -51 +51 @@
             virtual void incomingChat(const std::string& message, unsigned int senderID);
 
-            std::list<Ogre::UTFString> messages_;
+            std::list<Ogre::DisplayString> messages_;
 
         private: