Fixed mouse invert settings; removed camera scroll setting

po/colobot.pot

@@ -370,9 +370,6 @@ msgstr ""
 msgid "Film sequences\\Films before and after the missions"
 msgstr ""
 
-msgid "Scrolling\\Scrolling when the mouse touches right or left border"
-msgstr ""
-
 msgid "Mouse inversion X\\Inversion of the scrolling direction on the X axis"
 msgstr ""
 

po/de.po

@@ -1311,10 +1311,6 @@ msgstr "Speichern\\Aktuelle Mission speichern"
 msgid "Save\\Saves the current mission"
 msgstr "Speichern\\Speichert die Mission"
 
-msgid "Scrolling\\Scrolling when the mouse touches right or left border"
-msgstr ""
-"Kameradrehung mit der Maus\\Die Kamera dreht wenn die Maus den Rand erreicht"
-
 msgid "Select the astronaut\\Selects the astronaut"
 msgstr "Astronauten auswählen\\Astronauten auswählen"
 
@@ -1905,6 +1901,11 @@ msgstr "www.epsitec.com"
 #~ msgid "Robbie\\Your assistant"
 #~ msgstr "Robby\\Ihr Assistent"
 
+#~ msgid "Scrolling\\Scrolling when the mouse touches right or left border"
+#~ msgstr ""
+#~ "Kameradrehung mit der Maus\\Die Kamera dreht wenn die Maus den Rand "
+#~ "erreicht"
+
 #~ msgid "Sky\\Clouds and nebulae"
 #~ msgstr "Himmel\\Himmel und Wolken"
 

po/fr.po

@@ -1299,11 +1299,6 @@ msgstr "Enregistrer\\Enregistrer la mission en cours"
 msgid "Save\\Saves the current mission"
 msgstr "Enregistrer\\Enregistrer la mission en cours"
 
-msgid "Scrolling\\Scrolling when the mouse touches right or left border"
-msgstr ""
-"Défilement dans les bords\\Défilement lorsque la souris touches les bords "
-"gauche ou droite"
-
 msgid "Select the astronaut\\Selects the astronaut"
 msgstr "Sélectionner le cosmonaute\\Sélectionner le cosmonaute"
 
@@ -1892,6 +1887,11 @@ msgstr "www.epsitec.com"
 #~ msgid "Robbie\\Your assistant"
 #~ msgstr "Robbie\\Votre assistant"
 
+#~ msgid "Scrolling\\Scrolling when the mouse touches right or left border"
+#~ msgstr ""
+#~ "Défilement dans les bords\\Défilement lorsque la souris touches les bords "
+#~ "gauche ou droite"
+
 #~ msgid "Sky\\Clouds and nebulae"
 #~ msgstr "Ciel\\Ciel et nuages"
 

po/pl.po

@@ -1307,11 +1307,6 @@ msgstr "Zapisz\\Zapisuje bieżącą misję"
 msgid "Save\\Saves the current mission"
 msgstr "Zapisz\\Zapisuje bieżącą misję"
 
-msgid "Scrolling\\Scrolling when the mouse touches right or left border"
-msgstr ""
-"Przewijanie\\Ekran jest przewijany gdy mysz dotknie prawej lub lewej jego "
-"krawędzi"
-
 msgid "Select the astronaut\\Selects the astronaut"
 msgstr "Zaznacz astronautę\\Zaznacza astronautę"
 
@@ -1885,6 +1880,11 @@ msgstr "www.epsitec.com"
 #~ msgid "Robbie\\Your assistant"
 #~ msgstr "Robbie\\Twój asystent"
 
+#~ msgid "Scrolling\\Scrolling when the mouse touches right or left border"
+#~ msgstr ""
+#~ "Przewijanie\\Ekran jest przewijany gdy mysz dotknie prawej lub lewej jego "
+#~ "krawędzi"
+
 #~ msgid "Sky\\Clouds and nebulae"
 #~ msgstr "Niebo\\Chmury i mgławice"
 

po/ru.po

@@ -1306,9 +1306,6 @@ msgstr "Сохранить\\Сохранить текущую миссию"
 msgid "Save\\Saves the current mission"
 msgstr "Сохранить\\Сохранить текущую миссию"
 
-msgid "Scrolling\\Scrolling when the mouse touches right or left border"
-msgstr "Прокрутка\\Прокрутка, когда указатель мыши касается граней экрана"
-
 msgid "Select the astronaut\\Selects the astronaut"
 msgstr "Выбор астронавта\\Выбор астронавта"
 
@@ -1896,6 +1893,9 @@ msgstr "www.epsitec.com"
 #~ msgid "Robbie\\Your assistant"
 #~ msgstr "Робби\\Ваш помощник"
 
+#~ msgid "Scrolling\\Scrolling when the mouse touches right or left border"
+#~ msgstr "Прокрутка\\Прокрутка, когда указатель мыши касается граней экрана"
+
 #~ msgid "Sky\\Clouds and nebulae"
 #~ msgstr "Небо\\Облака и туманности"
 

src/common/event.cpp

@@ -208,7 +208,6 @@ void InitializeEventTypeTexts()
     EVENT_TYPE_TEXT[EVENT_INTERFACE_GLINT]   = "EVENT_INTERFACE_GLINT";
     EVENT_TYPE_TEXT[EVENT_INTERFACE_TOOLTIP] = "EVENT_INTERFACE_TOOLTIP";
     EVENT_TYPE_TEXT[EVENT_INTERFACE_MOVIES]  = "EVENT_INTERFACE_MOVIES";
-    EVENT_TYPE_TEXT[EVENT_INTERFACE_SCROLL]  = "EVENT_INTERFACE_SCROLL";
     EVENT_TYPE_TEXT[EVENT_INTERFACE_INVERTX] = "EVENT_INTERFACE_INVERTX";
     EVENT_TYPE_TEXT[EVENT_INTERFACE_INVERTY] = "EVENT_INTERFACE_INVERTY";
     EVENT_TYPE_TEXT[EVENT_INTERFACE_EFFECT]  = "EVENT_INTERFACE_EFFECT";

src/common/event.h

@@ -237,7 +237,6 @@ enum EventType
     EVENT_INTERFACE_GLINT   = 463,
     EVENT_INTERFACE_TOOLTIP = 464,
     EVENT_INTERFACE_MOVIES  = 465,
-    EVENT_INTERFACE_SCROLL  = 467,
     EVENT_INTERFACE_INVERTX = 468,
     EVENT_INTERFACE_INVERTY = 469,
     EVENT_INTERFACE_EFFECT  = 470,

src/common/restext.cpp

@@ -190,7 +190,6 @@ void InitializeRestext()
     stringsEvent[EVENT_INTERFACE_GLINT]     = TR("Reflections on the buttons \\Shiny buttons");
     stringsEvent[EVENT_INTERFACE_TOOLTIP]   = TR("Help balloons\\Explain the function of the buttons");
     stringsEvent[EVENT_INTERFACE_MOVIES]    = TR("Film sequences\\Films before and after the missions");
-    stringsEvent[EVENT_INTERFACE_SCROLL]    = TR("Scrolling\\Scrolling when the mouse touches right or left border");
     stringsEvent[EVENT_INTERFACE_INVERTX]   = TR("Mouse inversion X\\Inversion of the scrolling direction on the X axis");
     stringsEvent[EVENT_INTERFACE_INVERTY]   = TR("Mouse inversion Y\\Inversion of the scrolling direction on the Y axis");
     stringsEvent[EVENT_INTERFACE_EFFECT]    = TR("Quake at explosions\\The screen shakes at explosions");

src/common/settings.cpp

@@ -80,7 +80,6 @@ void CSettings::SaveSettings()
     GetConfigFile().SetBoolProperty("Setup", "Soluce4", m_soluce4);
     GetConfigFile().SetBoolProperty("Setup", "Movies", m_movies);
     GetConfigFile().SetBoolProperty("Setup", "FocusLostPause", m_focusLostPause);
-    GetConfigFile().SetBoolProperty("Setup", "CameraScroll", camera->GetCameraScroll());
     GetConfigFile().SetBoolProperty("Setup", "CameraInvertX", camera->GetCameraInvertX());
     GetConfigFile().SetBoolProperty("Setup", "CameraInvertY", camera->GetCameraInvertY());
     GetConfigFile().SetBoolProperty("Setup", "InterfaceEffect", camera->GetEffect());
@@ -152,9 +151,6 @@ void CSettings::LoadSettings()
     GetConfigFile().GetBoolProperty("Setup", "Movies", m_movies);
     GetConfigFile().GetBoolProperty("Setup", "FocusLostPause", m_focusLostPause);
 
-    if (GetConfigFile().GetBoolProperty("Setup", "CameraScroll", bValue))
-        camera->SetCameraScroll(bValue);
-
     if (GetConfigFile().GetBoolProperty("Setup", "CameraInvertX", bValue))
         camera->SetCameraInvertX(bValue);
 

src/graphics/engine/camera.cpp

@@ -152,7 +152,6 @@ CCamera::CCamera()
 
     m_effect        = true;
     m_blood         = true;
-    m_cameraScroll  = true;
     m_cameraInvertX = false;
     m_cameraInvertY = false;
 }
@@ -181,16 +180,6 @@ bool CCamera::GetBlood()
     return m_blood;
 }
 
-void CCamera::SetCameraScroll(bool scroll)
-{
-    m_cameraScroll = scroll;
-}
-
-bool CCamera::GetCameraScroll()
-{
-    return m_cameraScroll;
-}
-
 void CCamera::SetCameraInvertX(bool invert)
 {
     m_cameraInvertX = invert;
@@ -1080,7 +1069,13 @@ bool CCamera::EventProcess(const Event &event)
 bool CCamera::EventMouseMove(const Event &event)
 {
     m_mouseDelta += (event.mousePos - m_mousePos);
+    if (m_cameraInvertX)
+        m_mouseDelta.x = -m_mouseDelta.x;
+    if (m_cameraInvertY)
+        m_mouseDelta.y = -m_mouseDelta.y;
+
     m_mousePos = event.mousePos;
+    
     if (m_mouseRightDown)
         m_engine->SetMouseType(ENG_MOUSE_MOVE);
     return true;

src/graphics/engine/camera.h

@@ -204,8 +204,6 @@ public:
     bool        GetEffect();
     void        SetBlood(bool enable);
     bool        GetBlood();
-    void        SetCameraScroll(bool scroll);
-    bool        GetCameraScroll();
     void        SetCameraInvertX(bool invert);
     bool        GetCameraInvertX();
     void        SetCameraInvertY(bool invert);

src/ui/screen/screen_setup_game.cpp

@@ -69,9 +69,6 @@ void CScreenSetupGame::CreateInterface()
     pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_MOVIES);
     pc->SetState(STATE_SHADOW);
     pos.y -= 0.048f;
-    pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_SCROLL);
-    pc->SetState(STATE_SHADOW);
-    pos.y -= 0.048f;
     pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_INVERTX);
     pc->SetState(STATE_SHADOW);
     pos.y -= 0.048f;
@@ -213,12 +210,6 @@ bool CScreenSetupGame::EventProcess(const Event &event)
             UpdateSetupButtons();
             break;
 
-        case EVENT_INTERFACE_SCROLL:
-            m_camera->SetCameraScroll(!m_camera->GetCameraScroll());
-            ChangeSetupButtons();
-            UpdateSetupButtons();
-            break;
-
         case EVENT_INTERFACE_INVERTX:
             m_camera->SetCameraInvertX(!m_camera->GetCameraInvertX());
             ChangeSetupButtons();
@@ -322,12 +313,6 @@ void CScreenSetupGame::UpdateSetupButtons()
         pc->SetState(STATE_CHECK, m_settings->GetMovies());
     }
 
-    pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_SCROLL));
-    if ( pc != nullptr )
-    {
-        pc->SetState(STATE_CHECK, m_camera->GetCameraScroll());
-    }
-
     pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_INVERTX));
     if ( pc != nullptr )
     {