[colobot] 303/390: Changed default of countTransported to true

[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 1b18b145cc4f773d6a42b12fefdc3494c26e5d1e
Author: krzys-h <krzys_h at interia.pl>
Date:   Sun Mar 29 15:38:48 2015 +0200

    Changed default of countTransported to true
    
    This causes failure conditions to trigger in some exercises
     #412
---
 src/object/robotmain.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 9797e3c..2efd262 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -1933,8 +1933,11 @@ void CRobotMain::DeleteAllObjects()
     {
         CObject* obj = it.second;
 
-        obj->DeleteObject(true);  // destroys rapidly
-        delete obj;
+        if(obj != nullptr)
+        {
+            obj->DeleteObject(true);  // destroys rapidly
+            delete obj;
+        }
     }
 }
 
@@ -3844,7 +3847,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
                     m_endTake[i].drive    = line->GetParam("drive")->AsDriveType(DRIVE_OTHER);
                     m_endTake[i].lost     = line->GetParam("lost")->AsInt(-1);
                     m_endTake[i].immediat = line->GetParam("immediat")->AsBool(false);
-                    m_endTake[i].countTransported = line->GetParam("countTransported")->AsBool(false);
+                    m_endTake[i].countTransported = line->GetParam("countTransported")->AsBool(true);
                     strcpy(m_endTake[i].message, line->GetParam("message")->AsString("").c_str()); //TODO: Really, ending mission on message()? Is this used anywhere? Do we need that?
                     m_endTakeTotal ++;
                 }

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