diff options
| author | krzys-h <krzys_h@interia.pl> | 2013-12-25 18:53:32 +0100 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2013-12-25 18:53:32 +0100 |
| commit | d0285d688615beb62a5b9e742b8d4103371695c5 (patch) | |
| tree | ab041b8547b0c9475b694f1e33ce66b3995bcfd2 | |
| parent | 813a1a7a13c5e03a1b6a58d8ffb3502cdf5ea863 (diff) | |
| download | colobot-d0285d688615beb62a5b9e742b8d4103371695c5.tar.gz colobot-d0285d688615beb62a5b9e742b8d4103371695c5.tar.bz2 colobot-d0285d688615beb62a5b9e742b8d4103371695c5.zip | |
Fixed AudioChange
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | src/object/robotmain.cpp | 17 |
2 files changed, 12 insertions, 8 deletions
@@ -24,3 +24,6 @@ Makefile # Ignore KDevelop files .kdev4 *.kdev4 + +# Ignore gedit temp files +*~ diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 35ffe97..4b45a20 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -4110,12 +4110,12 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) if (i < 10) { m_audioChange[i].pos = OpPos(line, "pos")*g_unit; - m_audioChange[i].dist = OpFloat(line, "dist", 8.0f)*g_unit; + m_audioChange[i].dist = OpFloat(line, "dist", 1000.0f)*g_unit; m_audioChange[i].type = OpTypeObject(line, "type", OBJECT_NULL); m_audioChange[i].min = OpInt(line, "min", 1); m_audioChange[i].max = OpInt(line, "max", 9999); - m_audioChange[i].powermin = OpInt(line, "powermin", -1); - m_audioChange[i].powermax = OpInt(line, "powermax", 100); + m_audioChange[i].powermin = OpFloat(line, "powermin", -1); + m_audioChange[i].powermax = OpFloat(line, "powermax", 100); OpString(line, "filename", m_audioChange[i].music); m_audioChange[i].repeat = OpInt(line, "repeat", 1); m_audioChange[i].changed = false; @@ -4911,14 +4911,14 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) if (i < 10) { m_endTake[i].pos = OpPos(line, "pos")*g_unit; - m_endTake[i].dist = OpFloat(line, "dist", 8.0f)*g_unit; + m_endTake[i].dist = OpFloat(line, "dist", (m_version < 2 ? 8.0f : 100.0f))*g_unit; m_endTake[i].type = OpTypeObject(line, "type", OBJECT_NULL); m_endTake[i].min = OpInt(line, "min", 1); m_endTake[i].max = OpInt(line, "max", 9999); if (m_version >= 2) { - m_endTake[i].powermin = OpInt(line, "powermin", -1); - m_endTake[i].powermax = OpInt(line, "powermax", 100); + m_endTake[i].powermin = OpFloat(line, "powermin", -1); + m_endTake[i].powermax = OpFloat(line, "powermax", 100); } else { @@ -6923,7 +6923,8 @@ void CRobotMain::UpdateAudio(bool frame) energyLevel = power->GetEnergy(); if (power->GetType() == OBJECT_ATOMIC) energyLevel *= 100; } - if (energyLevel < m_audioChange[t].powermin || energyLevel > m_audioChange[t].powermax) continue; + if (energyLevel < m_audioChange[t].powermin || energyLevel > m_audioChange[t].powermax) + continue; if (obj->GetTruck() == 0) oPos = obj->GetPosition(0); @@ -6939,7 +6940,7 @@ void CRobotMain::UpdateAudio(bool frame) if (nb >= m_audioChange[t].min && nb <= m_audioChange[t].max) { - CLogger::GetInstancePointer()->Debug("Changing music...\n"); + CLogger::GetInstancePointer()->Info("Changing music to \"%s\"\n", m_audioChange[t].music); m_sound->StopMusic(); m_sound->PlayMusic(std::string(m_audioChange[t].music), m_audioChange[t].repeat); m_audioChange[t].changed = true; |