Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6414 for code/branches


Ignore:
Timestamp:
Dec 25, 2009, 2:07:44 PM (15 years ago)
Author:
dafrick
Message:

Added changes to presentation2 here as well.

Location:
code/branches/pickup2/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/pickup2/src/libraries/core/DynLib.cc

    r6412 r6414  
    7070        COUT(2) << "Loading module " << mName << std::endl;
    7171
    72         const std::string& name = mName;
     72        std::string& name = mName;
    7373#ifdef ORXONOX_PLATFORM_LINUX
    7474        // dlopen() does not add .so to the filename, like windows does for .dll
  • code/branches/pickup2/src/orxonox/sound/SoundManager.cc

    r6412 r6414  
    608608            }
    609609        }
    610         int used = std::max(this->usedSoundSources_.size(), this->minSources_);
     610        int used = std::max((unsigned int)(this->usedSoundSources_.size()), this->minSources_);
    611611        // Subtract those we added in the statement above trough std::max
    612612        int available = (int)this->availableSoundSources_.size() - (used - (int)this->usedSoundSources_.size());
Note: See TracChangeset for help on using the changeset viewer.