Changeset 8043

Timestamp:

Mar 8, 2011, 6:26:51 AM (13 years ago)

Author:

rgrieder

Message:

Removed unnecessary changes in mac_osx branch.

Location:

code/branches/mac_osx/src

Files:

• external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified) (1 diff)
• libraries/core/DynLib.h (modified) (1 diff)
• libraries/core/GUIManager.cc (modified) (1 diff)
• libraries/core/GraphicsManager.cc (modified) (2 diffs)
• libraries/core/PathConfig.cc (modified) (1 diff)
• orxonox/MoodManager.cc (modified) (1 diff)
• orxonox/sound/SoundManager.cc (modified) (2 diffs)

code/branches/mac_osx/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp

@@ -38 +38 @@
 int gNumGjkChecks = 0;
 
-#ifdef check
-struct CompilerError
-{
-    void CompilerError() {}
-};
-#endif
 
 

code/branches/mac_osx/src/libraries/core/DynLib.h

@@ -110 +110 @@
 
     protected:
+
         /// Handle to the loaded library.
         DYNLIB_HANDLE m_hInst;

code/branches/mac_osx/src/libraries/core/GUIManager.cc

@@ -351 +351 @@
     void GUIManager::buttonPressed(MouseButtonCode::ByEnum id)
     {
-        //guiSystem_->injectMouseButtonDown(convertButton(id));
         this->protectedCall(boost::bind(&CEGUI::System::injectMouseButtonDown, _1, convertButton(id)));
     }

code/branches/mac_osx/src/libraries/core/GraphicsManager.cc

@@ -314 +314 @@
 
         Ogre::WindowEventUtilities::addWindowEventListener(this->renderWindow_, ogreWindowEventListener_.get());
-                
+
 // HACK
 #ifdef ORXONOX_PLATFORM_APPLE
@@ -323 +323 @@
 #endif
 // End of HACK
-                
+
         // create a full screen default viewport
         // Note: This may throw when adding a viewport with an existing z-order!

code/branches/mac_osx/src/libraries/core/PathConfig.cc

@@ -206 +206 @@
 #ifdef ORXONOX_PLATFORM_UNIX
             char* userDataPathPtr(getenv("HOME"));
-#elif ORXONOX_PLATFORM_APPLE
-            char* userDataPathPtr(getenv("HOME"));
 #else
             char* userDataPathPtr(getenv("APPDATA"));

code/branches/mac_osx/src/orxonox/MoodManager.cc

@@ -50 +50 @@
 
         // Checking for the existence of the folder for the default mood
-        const std::string& patha = "ambient/" + MoodManager::defaultMood_ + "/.";
-        if (!Resource::exists(patha))
+        const std::string& path = "ambient/" + MoodManager::defaultMood_ + "/.";
+        if (!Resource::exists(path))
         {
             // TODO: Non-fatal error handling (non-critical resource missing)

code/branches/mac_osx/src/orxonox/sound/SoundManager.cc

@@ -83 +83 @@
         SetConfigValue(bDisableSound_, false);
         if (bDisableSound_)
-            ThrowException(InitialisationAborted, "Sound: Not loading at all");        
+            ThrowException(InitialisationAborted, "Sound: Not loading at all");
         if (!alutInitWithoutContext(NULL, NULL))
             ThrowException(InitialisationFailed, "Sound Error: ALUT initialisation failed: " << alutGetErrorString(alutGetError()));
@@ -131 +131 @@
         GameMode::setPlaysSound(true);
         Loki::ScopeGuard resetPlaysSoundGuard = Loki::MakeGuard(&GameMode::setPlaysSound, false);
-        
+
         // Get some information about the sound
         if (const char* version = alGetString(AL_VERSION))
-            COUT(4) << "Sound: --- OpenAL Version: " << version << std::endl;            
+            COUT(4) << "Sound: --- OpenAL Version: " << version << std::endl;
         if (const char* vendor = alGetString(AL_VENDOR))
             COUT(4) << "Sound: --- OpenAL Vendor : " << vendor << std::endl;