Changeset 9675 for code/trunk/src/libraries/core/GraphicsManager.cc

Timestamp:

Sep 26, 2013, 11:03:33 PM (11 years ago)

Author:

landauf

Message:

merged branch 'libs' back to trunk. orxonox now compiles and runs with ogre 1.8 and it compiles (but doesn't run) with cegui 0.8

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/GraphicsManager.cc (modified) (1 diff)

code/trunk/src/libraries/core/GraphicsManager.cc

@@ -402 +402 @@
         The name of this log (so you can have several listeners
         for different logs, and identify them)
+    @param skipThisMessage
+        If set to true by the messageLogged() implementation message will not be logged
     */
+#if OGRE_VERSION >= 0x010800
+    void GraphicsManager::messageLogged(const std::string& message,
+        Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage)
+        // TODO: do we have to ignore the message if skipThisMessage is set?
+#else
     void GraphicsManager::messageLogged(const std::string& message,
         Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName)
+#endif
     {
         OutputLevel orxonoxLevel;