Changeset 9669 for code/branches/libs/src/libraries/core
- Timestamp:
- Sep 4, 2013, 9:49:17 PM (11 years ago)
- Location:
- code/branches/libs/src/libraries/core
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/libs/src/libraries/core/GraphicsManager.cc
r9667 r9669 402 402 The name of this log (so you can have several listeners 403 403 for different logs, and identify them) 404 @param skipThisMessage 405 If set to true by the messageLogged() implementation message will not be logged 404 406 */ 407 #if OGRE_VERSION >= 0x010800 408 void GraphicsManager::messageLogged(const std::string& message, 409 Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage) 410 // TODO: do we have to ignore the message if skipThisMessage is set? 411 #else 405 412 void GraphicsManager::messageLogged(const std::string& message, 406 413 Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName) 414 #endif 407 415 { 408 416 OutputLevel orxonoxLevel; -
code/branches/libs/src/libraries/core/GraphicsManager.h
r9667 r9669 108 108 109 109 // event from Ogre::LogListener 110 void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, 111 bool maskDebug, const std::string& logName); 110 #if OGRE_VERSION >= 0x010800 111 void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage); 112 #else 113 void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName); 114 #endif 112 115 113 116 // console commands -
code/branches/libs/src/libraries/core/Resource.cc
r8351 r9669 101 101 ptr->group = group; 102 102 ptr->size = it->uncompressedSize; 103 #if OGRE_VERSION >= 0x010800 104 if (dynamic_cast<const Ogre::FileSystemArchive*>(it->archive) != NULL) 105 #else 103 106 if (dynamic_cast<Ogre::FileSystemArchive*>(it->archive) != NULL) 107 #endif 104 108 { 105 109 boost::filesystem::path base(it->archive->getName());
Note: See TracChangeset
for help on using the changeset viewer.