- Timestamp:
- Mar 8, 2011, 6:26:51 AM (14 years ago)
- Location:
- code/branches/mac_osx/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/mac_osx/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
r7564 r8043 38 38 int gNumGjkChecks = 0; 39 39 40 #ifdef check41 struct CompilerError42 {43 void CompilerError() {}44 };45 #endif46 40 47 41 -
code/branches/mac_osx/src/libraries/core/DynLib.h
r7577 r8043 110 110 111 111 protected: 112 112 113 /// Handle to the loaded library. 113 114 DYNLIB_HANDLE m_hInst; -
code/branches/mac_osx/src/libraries/core/GUIManager.cc
r8042 r8043 351 351 void GUIManager::buttonPressed(MouseButtonCode::ByEnum id) 352 352 { 353 //guiSystem_->injectMouseButtonDown(convertButton(id));354 353 this->protectedCall(boost::bind(&CEGUI::System::injectMouseButtonDown, _1, convertButton(id))); 355 354 } -
code/branches/mac_osx/src/libraries/core/GraphicsManager.cc
r7664 r8043 314 314 315 315 Ogre::WindowEventUtilities::addWindowEventListener(this->renderWindow_, ogreWindowEventListener_.get()); 316 316 317 317 // HACK 318 318 #ifdef ORXONOX_PLATFORM_APPLE … … 323 323 #endif 324 324 // End of HACK 325 325 326 326 // create a full screen default viewport 327 327 // Note: This may throw when adding a viewport with an existing z-order! -
code/branches/mac_osx/src/libraries/core/PathConfig.cc
r7669 r8043 206 206 #ifdef ORXONOX_PLATFORM_UNIX 207 207 char* userDataPathPtr(getenv("HOME")); 208 #elif ORXONOX_PLATFORM_APPLE209 char* userDataPathPtr(getenv("HOME"));210 208 #else 211 209 char* userDataPathPtr(getenv("APPDATA")); -
code/branches/mac_osx/src/orxonox/MoodManager.cc
r7767 r8043 50 50 51 51 // Checking for the existence of the folder for the default mood 52 const std::string& path a= "ambient/" + MoodManager::defaultMood_ + "/.";53 if (!Resource::exists(path a))52 const std::string& path = "ambient/" + MoodManager::defaultMood_ + "/."; 53 if (!Resource::exists(path)) 54 54 { 55 55 // TODO: Non-fatal error handling (non-critical resource missing) -
code/branches/mac_osx/src/orxonox/sound/SoundManager.cc
r7767 r8043 83 83 SetConfigValue(bDisableSound_, false); 84 84 if (bDisableSound_) 85 ThrowException(InitialisationAborted, "Sound: Not loading at all"); 85 ThrowException(InitialisationAborted, "Sound: Not loading at all"); 86 86 if (!alutInitWithoutContext(NULL, NULL)) 87 87 ThrowException(InitialisationFailed, "Sound Error: ALUT initialisation failed: " << alutGetErrorString(alutGetError())); … … 131 131 GameMode::setPlaysSound(true); 132 132 Loki::ScopeGuard resetPlaysSoundGuard = Loki::MakeGuard(&GameMode::setPlaysSound, false); 133 133 134 134 // Get some information about the sound 135 135 if (const char* version = alGetString(AL_VERSION)) 136 COUT(4) << "Sound: --- OpenAL Version: " << version << std::endl; 136 COUT(4) << "Sound: --- OpenAL Version: " << version << std::endl; 137 137 if (const char* vendor = alGetString(AL_VENDOR)) 138 138 COUT(4) << "Sound: --- OpenAL Vendor : " << vendor << std::endl;
Note: See TracChangeset
for help on using the changeset viewer.