summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2014-09-27 18:34:08 +0200
committerkrzys-h <krzys_h@interia.pl>2014-09-27 18:34:08 +0200
commitad79babbc135ecc83a43391bbc026fd038efc290 (patch)
treefd82aa46d47758172ee659d45238592272777ca8
parentfd68ac923acb14550c5eb2c8d07ef6c9ed87714c (diff)
downloadcolobot-ad79babbc135ecc83a43391bbc026fd038efc290.tar.gz
colobot-ad79babbc135ecc83a43391bbc026fd038efc290.tar.bz2
colobot-ad79babbc135ecc83a43391bbc026fd038efc290.zip
Made proxyDistance optional
-rw-r--r--src/object/robotmain.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 6fda290..51af57c 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -4532,8 +4532,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
obj->SetIgnoreBuildCheck(line->GetParam("ignoreBuildCheck")->AsBool(false));
obj->SetEnable(line->GetParam("enable")->AsBool(true));
obj->SetProxyActivate(line->GetParam("proxyActivate")->AsBool(false));
- if(line->GetParam("proxyActivate")->AsBool(false))
- obj->SetProxyDistance(line->GetParam("proxyDistance")->AsFloat()*g_unit);
+ obj->SetProxyDistance(line->GetParam("proxyDistance")->AsFloat(15.0f)*g_unit);
obj->SetRange(line->GetParam("range")->AsFloat(30.0f));
obj->SetShield(line->GetParam("shield")->AsFloat(1.0f));
obj->SetMagnifyDamage(line->GetParam("magnifyDamage")->AsFloat(1.0f));