Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8043 for code


Ignore:
Timestamp:
Mar 8, 2011, 6:26:51 AM (14 years ago)
Author:
rgrieder
Message:

Removed unnecessary changes in mac_osx branch.

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  
    3838int gNumGjkChecks = 0;
    3939
    40 #ifdef check
    41 struct CompilerError
    42 {
    43     void CompilerError() {}
    44 };
    45 #endif
    4640
    4741
  • code/branches/mac_osx/src/libraries/core/DynLib.h

    r7577 r8043  
    110110
    111111    protected:
     112
    112113        /// Handle to the loaded library.
    113114        DYNLIB_HANDLE m_hInst;
  • code/branches/mac_osx/src/libraries/core/GUIManager.cc

    r8042 r8043  
    351351    void GUIManager::buttonPressed(MouseButtonCode::ByEnum id)
    352352    {
    353         //guiSystem_->injectMouseButtonDown(convertButton(id));
    354353        this->protectedCall(boost::bind(&CEGUI::System::injectMouseButtonDown, _1, convertButton(id)));
    355354    }
  • code/branches/mac_osx/src/libraries/core/GraphicsManager.cc

    r7664 r8043  
    314314
    315315        Ogre::WindowEventUtilities::addWindowEventListener(this->renderWindow_, ogreWindowEventListener_.get());
    316                
     316
    317317// HACK
    318318#ifdef ORXONOX_PLATFORM_APPLE
     
    323323#endif
    324324// End of HACK
    325                
     325
    326326        // create a full screen default viewport
    327327        // Note: This may throw when adding a viewport with an existing z-order!
  • code/branches/mac_osx/src/libraries/core/PathConfig.cc

    r7669 r8043  
    206206#ifdef ORXONOX_PLATFORM_UNIX
    207207            char* userDataPathPtr(getenv("HOME"));
    208 #elif ORXONOX_PLATFORM_APPLE
    209             char* userDataPathPtr(getenv("HOME"));
    210208#else
    211209            char* userDataPathPtr(getenv("APPDATA"));
  • code/branches/mac_osx/src/orxonox/MoodManager.cc

    r7767 r8043  
    5050
    5151        // Checking for the existence of the folder for the default mood
    52         const std::string& patha = "ambient/" + MoodManager::defaultMood_ + "/.";
    53         if (!Resource::exists(patha))
     52        const std::string& path = "ambient/" + MoodManager::defaultMood_ + "/.";
     53        if (!Resource::exists(path))
    5454        {
    5555            // TODO: Non-fatal error handling (non-critical resource missing)
  • code/branches/mac_osx/src/orxonox/sound/SoundManager.cc

    r7767 r8043  
    8383        SetConfigValue(bDisableSound_, false);
    8484        if (bDisableSound_)
    85             ThrowException(InitialisationAborted, "Sound: Not loading at all");       
     85            ThrowException(InitialisationAborted, "Sound: Not loading at all");
    8686        if (!alutInitWithoutContext(NULL, NULL))
    8787            ThrowException(InitialisationFailed, "Sound Error: ALUT initialisation failed: " << alutGetErrorString(alutGetError()));
     
    131131        GameMode::setPlaysSound(true);
    132132        Loki::ScopeGuard resetPlaysSoundGuard = Loki::MakeGuard(&GameMode::setPlaysSound, false);
    133        
     133
    134134        // Get some information about the sound
    135135        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;
    137137        if (const char* vendor = alGetString(AL_VENDOR))
    138138            COUT(4) << "Sound: --- OpenAL Vendor : " << vendor << std::endl;
Note: See TracChangeset for help on using the changeset viewer.