[colobot] 118/390: Disable resolution settings in simulation

[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 182d5206a8dcdbf112e5e2099a71c8dc82b9ffa1
Author: krzys-h <krzys_h at interia.pl>
Date:   Sat Oct 25 17:23:09 2014 +0200

    Disable resolution settings in simulation
---
 src/ui/maindialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp
index 3dce5a0..e553d69 100644
--- a/src/ui/maindialog.cpp
+++ b/src/ui/maindialog.cpp
@@ -968,6 +968,7 @@ void CMainDialog::ChangePhase(Phase phase)
         pb->SetState(STATE_SHADOW);
         pb->SetState(STATE_CARD);
         pb->SetState(STATE_CHECK, (m_phase == PHASE_SETUPd || m_phase == PHASE_SETUPds));
+        pb->SetState(STATE_ENABLE, !m_bSimulSetup);
 
         pos.x += ddim.x+0.01f;
         pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_SETUPg);
@@ -4532,7 +4533,6 @@ void CMainDialog::UpdateSceneList(int chap, int &sel)
     {
         m_maxList = j+1;  // this is not the last!
     }
-    CLogger::GetInstancePointer()->Debug("m_maxList = %d\n", m_maxList);
 
     if ( sel > j-1 )  sel = j-1;
 

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