[colobot] 71/390: Made proxyDistance optional

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit ad79babbc135ecc83a43391bbc026fd038efc290
Author: krzys-h <krzys_h at interia.pl>
Date:   Sat Sep 27 18:34:08 2014 +0200

    Made proxyDistance optional
---
 src/object/robotmain.cpp | 3 +--
 1 file changed, 1 insertion(+), 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));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git