summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorerihel <erihel@gmail.com>2013-04-20 19:42:05 +0200
committererihel <erihel@gmail.com>2013-04-20 19:42:05 +0200
commit1932cfbfd05ffc049034cd0fe58f2b3680171435 (patch)
tree4a71898e9ffbafb18c0e455fd7d41a31315d2ad0 /src
parent32fdf993ea278c3e5a0ffc62f8144dfd9922ba6c (diff)
parent364482f022369c219ef1453709732690d18e72f8 (diff)
downloadcolobot-1932cfbfd05ffc049034cd0fe58f2b3680171435.tar.gz
colobot-1932cfbfd05ffc049034cd0fe58f2b3680171435.tar.bz2
colobot-1932cfbfd05ffc049034cd0fe58f2b3680171435.zip
Merge branch 'dev' of github:colobot/colobot into dev
Diffstat (limited to 'src')
-rw-r--r--src/object/robotmain.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 79fc1ab..2729e91 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -4680,6 +4680,9 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
if (m_version >= 2) {
m_endTake[i].powermin = OpInt(line, "powermin", -1);
m_endTake[i].powermax = OpInt(line, "powermax", 100);
+ } else {
+ m_endTake[i].powermin = -1;
+ m_endTake[i].powermax = 100;
}
m_endTake[i].lost = OpInt(line, "lost", -1);
m_endTake[i].immediat = OpInt(line, "immediat", 0);