summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2013-05-01 12:12:32 +0200
committerkrzys-h <krzys_h@interia.pl>2013-05-01 12:12:32 +0200
commitf419293207fe27113fb16daebec959e94a30dbee (patch)
tree2505b8c5b5eeef5f01a0b715044ca00bea3ef271 /src
parent643153d64dd25cb27fae76c9cc22e9bdaa2e352e (diff)
downloadcolobot-f419293207fe27113fb16daebec959e94a30dbee.tar.gz
colobot-f419293207fe27113fb16daebec959e94a30dbee.tar.bz2
colobot-f419293207fe27113fb16daebec959e94a30dbee.zip
Minor refactoring
Diffstat (limited to 'src')
-rw-r--r--src/object/robotmain.cpp2
-rw-r--r--src/sound/oalsound/alsound.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 67d4f44..ad4f48c 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -6760,7 +6760,7 @@ Error CRobotMain::CheckEndMission(bool frame)
}
if (frame && m_base) return ERR_MISSION_NOTERM;
if (m_missionResult == ERR_OK) { //mission win?
- if (!(frame && m_base)) m_displayText->DisplayError(INFO_WIN, Math::Vector(0.0f,0.0f,0.0f));
+ m_displayText->DisplayError(INFO_WIN, Math::Vector(0.0f,0.0f,0.0f));
if(m_winDelay == 0) m_winDelay = m_endTakeWinDelay;
m_lostDelay = 0.0f;
m_displayText->SetEnable(false);
diff --git a/src/sound/oalsound/alsound.cpp b/src/sound/oalsound/alsound.cpp
index cfb0c70..a37cced 100644
--- a/src/sound/oalsound/alsound.cpp
+++ b/src/sound/oalsound/alsound.cpp
@@ -258,7 +258,7 @@ bool ALSound::SearchFreeBuffer(Sound sound, int &channel, bool &bAlreadyLoaded)
return true;
}
delete chn;
- GetLogger()->Error("Could not open channel to play sound!");
+ GetLogger()->Error("Could not open channel to play sound!\n");
return false;
}
@@ -279,7 +279,7 @@ bool ALSound::SearchFreeBuffer(Sound sound, int &channel, bool &bAlreadyLoaded)
return true;
}
delete chn;
- GetLogger()->Warn("Could not open additional channel to play sound!");
+ GetLogger()->Warn("Could not open additional channel to play sound!\n");
}
}
}
@@ -287,7 +287,7 @@ bool ALSound::SearchFreeBuffer(Sound sound, int &channel, bool &bAlreadyLoaded)
int lowerOrEqual = -1;
for (auto it : mChannels) {
if (it.second->GetPriority() < priority) {
- GetLogger()->Debug("Sound channel with lower priority will be reused.");
+ GetLogger()->Debug("Sound channel with lower priority will be reused.\n");
channel = it.first;
return true;
}
@@ -297,7 +297,7 @@ bool ALSound::SearchFreeBuffer(Sound sound, int &channel, bool &bAlreadyLoaded)
if (lowerOrEqual != -1) {
channel = lowerOrEqual;
- GetLogger()->Debug("Sound channel with lower or equal priority will be reused.");
+ GetLogger()->Debug("Sound channel with lower or equal priority will be reused.\n");
return true;
}