cppcheck fixes

This commit is contained in:
KroArtem 2014-02-04 03:43:44 +04:00
parent 2772fafcf0
commit a7b2490be6
3 changed files with 5 additions and 6 deletions

View File

@ -268,7 +268,7 @@ void IrrDriver::renderGLSL(float dt)
// Is the lens flare enabled & visible? Check last frame's query.
const bool hasflare = World::getWorld()->getTrack()->hasLensFlare();
const bool hasgodrays = World::getWorld()->getTrack()->hasGodRays();
if (hasflare | hasgodrays)
if (hasflare || hasgodrays)
{
irr::video::COpenGLDriver* gl_driver = (irr::video::COpenGLDriver*)m_device->getVideoDriver();

View File

@ -590,7 +590,7 @@ public:
// ------------------------------------------------------------------------
/** \brief get information about given mode (returns true if 'mode' is of
* linear races type) */
bool isLinearRaceMode()
const bool isLinearRaceMode()
{
const int id = (int)m_minor_mode;
// info is stored in its ID for conveniance, see the macros LINEAR_RACE
@ -601,7 +601,7 @@ public:
// ------------------------------------------------------------------------
/** \brief Returns true if the current mode is a battle mode. */
bool isBattleMode()
const bool isBattleMode()
{
const int id = (int)m_minor_mode;
// This uses the numerical id of the mode, see the macros
@ -612,7 +612,7 @@ public:
// ------------------------------------------------------------------------
bool isTutorialMode()
const bool isTutorialMode()
{
return m_minor_mode == MINOR_MODE_TUTORIAL;
}
@ -629,7 +629,7 @@ public:
} // modeHasLaps
// ------------------------------------------------------------------------
/** Returns true if the currently selected minor mode has highscores. */
bool modeHasHighscores()
const bool modeHasHighscores()
{
//FIXME: this information is duplicated. RaceManager knows about it,
// and each World may set m_use_highscores to true or false.

View File

@ -305,7 +305,6 @@ void AddonsLoading::onUpdate(float delta)
**/
void AddonsLoading::startDownload()
{
std::string file = m_addon.getZipFileName();
std::string save = "tmp/"
+ StringUtils::getBasename(m_addon.getZipFileName());
m_download_request = new Online::HTTPRequest(save, /*manage mem*/false,