[colobot] 197/390: Fixed scenetest mode

[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 643d1ec46af27b9f6490ae8734912be59fea8260
Author: krzys-h <krzy...@interia.pl>
Date:   Mon Nov 10 20:23:18 2014 +0100

    Fixed scenetest mode
---
 data                     |  2 +-
 src/object/robotmain.cpp | 12 +++++++++---
 tools/check-levels.sh    |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/data b/data
index aadeb65..a801c72 160000
--- a/data
+++ b/data
@@ -1 +1 @@
-Subproject commit aadeb651f923e149377fc99cd084cb0e47335cdb
+Subproject commit a801c729b372628b50a1c48c7612e0a2bd757ab5
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 1fd9424..75b1e5f 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -4774,7 +4774,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, 
bool resetObject)
     m_dialog->SetStackRead("");
     
     if(m_app->GetSceneTestMode())
-        m_eventQueue->AddEvent(Event(EVENT_WIN));
+        m_eventQueue->AddEvent(Event(EVENT_QUIT));
 }
 
 //! Creates a directional light
@@ -6392,6 +6392,8 @@ Error CRobotMain::CheckEndMission(bool frame)
                 }
                 m_missionTimerEnabled = m_missionTimerStarted = false;
                 m_displayText->SetEnable(false);
+                if(m_exitAfterMission)
+                    m_eventQueue->AddEvent(Event(EVENT_QUIT));
                 return INFO_LOSTq;
             }
             else
@@ -6404,6 +6406,8 @@ Error CRobotMain::CheckEndMission(bool frame)
                 }
                 m_missionTimerEnabled = m_missionTimerStarted = false;
                 m_displayText->SetEnable(false);
+                if(m_exitAfterMission)
+                    m_eventQueue->AddEvent(Event(EVENT_QUIT));
                 return INFO_LOST;
             }
         }
@@ -6423,6 +6427,8 @@ Error CRobotMain::CheckEndMission(bool frame)
             }
             m_missionTimerEnabled = m_missionTimerStarted = false;
             m_displayText->SetEnable(false);
+            if(m_exitAfterMission)
+                m_eventQueue->AddEvent(Event(EVENT_QUIT));
             return ERR_OK;  // mission ended
         }
     }
@@ -6459,9 +6465,9 @@ Error CRobotMain::CheckEndMission(bool frame)
         m_missionTimerEnabled = m_missionTimerStarted = false;
         m_winDelay  = m_endTakeWinDelay;  // wins in two seconds
         m_lostDelay = 0.0f;
-        if(m_exitAfterMission)
-            m_eventQueue->AddEvent(Event(EVENT_QUIT));
     }
+    if(m_exitAfterMission)
+        m_eventQueue->AddEvent(Event(EVENT_QUIT));
     m_displayText->SetEnable(false);
     return ERR_OK;  // mission ended
 }
diff --git a/tools/check-levels.sh b/tools/check-levels.sh
index 127375f..f27d39b 100755
--- a/tools/check-levels.sh
+++ b/tools/check-levels.sh
@@ -13,7 +13,7 @@ for category in $categories; do
                        if [ ! -d 
/usr/local/share/games/colobot/levels/$category/chapter00$chapter/$level ]; 
then continue; fi
                        level=`echo -n $level | cut -d . -f 1 | tail -c 3`
                        echo $category$chapter$level
-                       colobot -runscene $category$chapter$level -scenetest 
-loglevel warn
+                       colobot -runscene $category$chapter$level -scenetest 
-loglevel warn -headless
                done
        done
 done

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

_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits