[colobot] 111/390: Fixed #341

Didier Raboud odyx at moszumanska.debian.org
Fri Jun 12 14:21:35 UTC 2015


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

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

commit 4c865322f0142b2ebeb89c4354c7a2f529ea4a7f
Author: krzys-h <krzys_h at interia.pl>
Date:   Sat Oct 25 11:30:38 2014 +0200

    Fixed #341
---
 src/object/robotmain.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 1ad3c6d..f13ef8b 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -4416,7 +4416,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
                         std::string op = "autoValue"+boost::lexical_cast<std::string>(i+1); // autoValue1..autoValue5
                         automat->SetValue(i, line->GetParam(op)->AsFloat(0.0f));
                     }
-                    automat->SetString(const_cast<char*>(line->GetParam("autoString")->AsString("").c_str()));
+                    automat->SetString(const_cast<char*>(line->GetParam("autoString")->AsPath("ai", "").c_str()));
                     
                     int i = line->GetParam("run")->AsInt(-1);
                     if (i != -1)
@@ -4681,7 +4681,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
             continue;
         }
         
-        if(read[0] != 0) continue; // ignore errors when loading saevd game (TODO: don't report ones that are just not loaded when loading saved game)
+        if(read[0] != 0) continue; // ignore errors when loading saved game (TODO: don't report ones that are just not loaded when loading saved game)
         if(resetObject) continue; // ignore when reseting just objects (TODO: see above)
         
         throw CLevelParserException("Unknown command: '"+line->GetCommand()+"' in "+line->GetLevel()->GetFilename()+":"+boost::lexical_cast<std::string>(line->GetLineNumber()));

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



More information about the Pkg-games-commits mailing list