[colobot] 80/145: Made clipping distance settings apply immediately

[Didier Raboud]

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

odyx pushed a commit to branch debian/master
in repository colobot.

commit cdd719cc470c359ea134a0f7f0fa38db726138fe
Author: krzys-h <krzys_h at interia.pl>
Date:   Sat May 21 19:05:18 2016 +0200

    Made clipping distance settings apply immediately
---
 src/ui/screen/screen_setup.cpp          | 2 --
 src/ui/screen/screen_setup_graphics.cpp | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ui/screen/screen_setup.cpp b/src/ui/screen/screen_setup.cpp
index 4d5c597..7f20eab 100644
--- a/src/ui/screen/screen_setup.cpp
+++ b/src/ui/screen/screen_setup.cpp
@@ -153,7 +153,6 @@ bool CScreenSetup::EventProcess(const Event &event)
                 (event.type == EVENT_KEY_DOWN && event.GetData<KeyEventData>()->key == KEY(ESCAPE)) )
         {
             m_settings->SaveSettings();
-            m_engine->ApplyChange();
             m_main->ChangePhase(PHASE_MAIN_MENU);
             return false;
         }
@@ -194,7 +193,6 @@ bool CScreenSetup::EventProcess(const Event &event)
                 (event.type == EVENT_KEY_DOWN && event.GetData<KeyEventData>()->key == KEY(ESCAPE)) )
         {
             m_settings->SaveSettings();
-            m_engine->ApplyChange();
             m_interface->DeleteControl(EVENT_WINDOW5);
             m_main->ChangePhase(PHASE_SIMUL);
             m_main->StopSuspend();
diff --git a/src/ui/screen/screen_setup_graphics.cpp b/src/ui/screen/screen_setup_graphics.cpp
index 83713b7..9346754 100644
--- a/src/ui/screen/screen_setup_graphics.cpp
+++ b/src/ui/screen/screen_setup_graphics.cpp
@@ -248,8 +248,12 @@ bool CScreenSetupGraphics::EventProcess(const Event &event)
     switch( event.type )
     {
         case EVENT_INTERFACE_PARTI:
+            ChangeSetupButtons();
+            break;
+
         case EVENT_INTERFACE_CLIP:
             ChangeSetupButtons();
+            m_engine->ApplyChange();
             break;
 
         case EVENT_INTERFACE_DIRTY:

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