Removed unused texture quality setting

po/colobot.pot

@@ -363,9 +363,6 @@ msgstr ""
 msgid "Details\\Visual quality of 3D objects"
 msgstr ""
 
-msgid "Textures\\Quality of textures "
-msgstr ""
-
 msgid "Num of decorative objects\\Number of purely ornamental objects"
 msgstr ""
 

po/de.po

@@ -1464,9 +1464,6 @@ msgstr "Zielscheibe"
 msgid "Target bot"
 msgstr "Mobile Zielscheibe"
 
-msgid "Textures\\Quality of textures "
-msgstr "Qualität der Texturen\\Qualität der Anzeige"
-
 msgid "The expression must return a boolean value"
 msgstr "Der Ausdruck muss einen boolschen Wert ergeben"
 
@@ -1853,5 +1850,8 @@ msgstr "www.epsitec.com"
 #~ msgid "Speed 3.0x\\Three times faster"
 #~ msgstr "Geschwindigkeit 3.0x\\Spielgeschwindigkeit drei Mal schneller"
 
+#~ msgid "Textures\\Quality of textures "
+#~ msgstr "Qualität der Texturen\\Qualität der Anzeige"
+
 #~ msgid "\\Return to COLOBOT"
 #~ msgstr "\\Zurück zu COLOBOT"

po/fr.po

@@ -1460,9 +1460,6 @@ msgstr "Cible"
 msgid "Target bot"
 msgstr "Cible d'entraînement"
 
-msgid "Textures\\Quality of textures "
-msgstr "Qualité des textures\\Qualité des images"
-
 msgid "The expression must return a boolean value"
 msgstr "L'expression doit ętre un boolean"
 
@@ -1849,5 +1846,8 @@ msgstr "www.epsitec.com"
 #~ msgid "Speed 3.0x\\Three times faster"
 #~ msgstr "Vitesse 3.0x\\Trois fois plus rapide"
 
+#~ msgid "Textures\\Quality of textures "
+#~ msgstr "Qualité des textures\\Qualité des images"
+
 #~ msgid "\\Return to COLOBOT"
 #~ msgstr "\\Retourner dans COLOBOT"

po/pl.po

@@ -1461,9 +1461,6 @@ msgstr "Cel"
 msgid "Target bot"
 msgstr "Robot cel"
 
-msgid "Textures\\Quality of textures "
-msgstr "Tekstury\\Jakość tekstur "
-
 msgid "The expression must return a boolean value"
 msgstr "Wyrażenie musi zwrócić wartość logiczną"
 
@@ -1835,3 +1832,6 @@ msgstr "www.epsitec.com"
 
 #~ msgid "Mouse shadow\\Gives the mouse a shadow"
 #~ msgstr "Cień kursora myszy\\Dodaje cień kursorowi myszy"
+
+#~ msgid "Textures\\Quality of textures "
+#~ msgstr "Tekstury\\Jakość tekstur "

po/ru.po

@@ -1456,9 +1456,6 @@ msgstr "Цель"
 msgid "Target bot"
 msgstr "Целевой бот"
 
-msgid "Textures\\Quality of textures "
-msgstr "Текстуры\\Качество текстур "
-
 msgid "The expression must return a boolean value"
 msgstr "Выражение должно возвращать логическое значение"
 
@@ -1845,5 +1842,8 @@ msgstr "www.epsitec.com"
 #~ msgid "Speed 3.0x\\Three times faster"
 #~ msgstr "Скорость 3.0х\\В три раза быстрее"
 
+#~ msgid "Textures\\Quality of textures "
+#~ msgstr "Текстуры\\Качество текстур "
+
 #~ msgid "\\Return to COLOBOT"
 #~ msgstr "\\Вернуться в COLOBOT"

src/common/event.cpp

@@ -201,7 +201,6 @@ void InitializeEventTypeTexts()
     EVENT_TYPE_TEXT[EVENT_INTERFACE_PARTI]   = "EVENT_INTERFACE_PARTI";
     EVENT_TYPE_TEXT[EVENT_INTERFACE_CLIP]    = "EVENT_INTERFACE_CLIP";
     EVENT_TYPE_TEXT[EVENT_INTERFACE_DETAIL]  = "EVENT_INTERFACE_DETAIL";
-    EVENT_TYPE_TEXT[EVENT_INTERFACE_TEXTURE] = "EVENT_INTERFACE_TEXTURE";
     EVENT_TYPE_TEXT[EVENT_INTERFACE_RAIN]    = "EVENT_INTERFACE_RAIN";
     EVENT_TYPE_TEXT[EVENT_INTERFACE_GLINT]   = "EVENT_INTERFACE_GLINT";
     EVENT_TYPE_TEXT[EVENT_INTERFACE_TOOLTIP] = "EVENT_INTERFACE_TOOLTIP";

src/common/event.h

@@ -222,7 +222,6 @@ enum EventType
     EVENT_INTERFACE_PARTI   = 458,
     EVENT_INTERFACE_CLIP    = 459,
     EVENT_INTERFACE_DETAIL  = 460,
-    EVENT_INTERFACE_TEXTURE = 461,
     EVENT_INTERFACE_RAIN    = 462,
     EVENT_INTERFACE_GLINT   = 463,
     EVENT_INTERFACE_TOOLTIP = 464,

src/common/restext.cpp

@@ -194,7 +194,6 @@ void InitializeRestext()
     stringsEvent[EVENT_INTERFACE_PARTI]     = TR("Number of particles\\Explosions, dust, reflections, etc.");
     stringsEvent[EVENT_INTERFACE_CLIP]      = TR("Render distance\\Maximum visibility");
     stringsEvent[EVENT_INTERFACE_DETAIL]    = TR("Details\\Visual quality of 3D objects");
-    stringsEvent[EVENT_INTERFACE_TEXTURE]   = TR("Textures\\Quality of textures ");
     stringsEvent[EVENT_INTERFACE_GADGET]    = TR("Num of decorative objects\\Number of purely ornamental objects");
     stringsEvent[EVENT_INTERFACE_RAIN]      = TR("Particles in the interface\\Steam clouds and sparks in the interface");
     stringsEvent[EVENT_INTERFACE_GLINT]     = TR("Reflections on the buttons \\Shiny buttons");

src/graphics/engine/engine.cpp

@@ -117,7 +117,6 @@ CEngine::CEngine(CApplication *app)
     m_objectDetail = 1.0f;
     m_terrainVision = 1000.0f;
     m_gadgetQuantity = 1.0f;
-    m_textureQuality = 1;
     m_textureMipmapLevel = 1;
     m_textureAnisotropy = 1;
     m_shadowMapping = false;
@@ -2837,23 +2836,6 @@ float CEngine::GetGadgetQuantity()
     return m_gadgetQuantity;
 }
 
-void CEngine::SetTextureQuality(int value)
-{
-    if (value < 0) value = 0;
-    if (value > 2) value = 2;
-
-    if (value != m_textureQuality)
-    {
-        m_textureQuality = value;
-        LoadAllTextures();
-    }
-}
-
-int CEngine::GetTextureQuality()
-{
-    return m_textureQuality;
-}
-
 void CEngine::SetTextureFilterMode(TexFilter value)
 {
     m_defaultTexParams.filter = value;

src/graphics/engine/engine.h

@@ -1114,12 +1114,6 @@ public:
     float           GetGadgetQuantity();
     //@}
 
-    //@{
-    //! Management the quality of textures
-    void            SetTextureQuality(int value);
-    int             GetTextureQuality();
-    //@}
-
     //@{
     //! Management the texture filter mode
     void            SetTextureFilterMode(TexFilter value);
@@ -1449,7 +1443,6 @@ protected:
     float           m_objectDetail;
     float           m_terrainVision;
     float           m_gadgetQuantity;
-    int             m_textureQuality;
     bool            m_totoMode;
     bool            m_lensMode;
     bool            m_waterMode;

src/ui/maindialog.cpp

@@ -1157,28 +1157,6 @@ void CMainDialog::ChangePhase(Phase phase)
             pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT);
         }
 
-#if 0
-        if ( !m_bSimulSetup )
-        {
-            pos.x = ox+sx*8.5f;
-            pos.y = 0.41f;
-            ddim.x = dim.x*2.2f;
-            ddim.y = 18.0f/480.0f;
-            pv = pw->CreateEditValue(pos, ddim, 0, EVENT_INTERFACE_TEXTURE);
-            pv->SetState(STATE_SHADOW);
-            pv->SetType(EVT_INT);
-            pv->SetMinValue(0.0f);
-            pv->SetMaxValue(2.0f);
-            pv->SetStepValue(1.0f);
-            pos.x += 0.13f;
-            pos.y -= 0.015f;
-            ddim.x = 0.40f;
-            GetResource(RES_EVENT, EVENT_INTERFACE_TEXTURE, name);
-            pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL14, name);
-            pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT);
-        }
-#endif
-
         ddim.x = dim.x*2;
         ddim.y = dim.y*1;
         pos.x = ox+sx*10;
@@ -2432,7 +2410,6 @@ bool CMainDialog::EventProcess(const Event &event)
             case EVENT_INTERFACE_CLIP:
             case EVENT_INTERFACE_DETAIL:
             case EVENT_INTERFACE_GADGET:
-            case EVENT_INTERFACE_TEXTURE:
                 ChangeSetupButtons();
                 break;
 
@@ -4698,13 +4675,6 @@ void CMainDialog::UpdateSetupButtons()
         pv->SetValue(value);
     }
 
-    pv = static_cast<CEditValue*>(pw->SearchControl(EVENT_INTERFACE_TEXTURE));
-    if ( pv != 0 )
-    {
-        value = static_cast<float>(m_engine->GetTextureQuality());
-        pv->SetValue(value);
-    }
-
     ps = static_cast<CSlider*>(pw->SearchControl(EVENT_INTERFACE_VOLSOUND));
     if ( ps != 0 )
     {
@@ -4760,13 +4730,6 @@ void CMainDialog::ChangeSetupButtons()
         m_engine->SetGadgetQuantity(value);
     }
 
-    pv = static_cast<CEditValue*>(pw->SearchControl(EVENT_INTERFACE_TEXTURE));
-    if ( pv != 0 )
-    {
-        value = pv->GetValue();
-        m_engine->SetTextureQuality(static_cast<int>(value));
-    }
-
     ps = static_cast<CSlider*>(pw->SearchControl(EVENT_INTERFACE_VOLSOUND));
     if ( ps != 0 )
     {
@@ -4829,7 +4792,6 @@ void CMainDialog::SetupMemorize()
     GetConfigFile().SetFloatProperty("Setup", "ClippingDistance", m_engine->GetClippingDistance());
     GetConfigFile().SetFloatProperty("Setup", "ObjectDetail", m_engine->GetObjectDetail());
     GetConfigFile().SetFloatProperty("Setup", "GadgetQuantity", m_engine->GetGadgetQuantity());
-    GetConfigFile().SetIntProperty("Setup", "TextureQuality", m_engine->GetTextureQuality());
     GetConfigFile().SetIntProperty("Setup", "TotoMode", m_engine->GetTotoMode());
     GetConfigFile().SetIntProperty("Setup", "AudioVolume", m_sound->GetAudioVolume());
     GetConfigFile().SetIntProperty("Setup", "MusicVolume", m_sound->GetMusicVolume());
@@ -5046,11 +5008,6 @@ void CMainDialog::SetupRecall()
         m_engine->SetGadgetQuantity(fValue);
     }
 
-    if ( GetConfigFile().GetIntProperty("Setup", "TextureQuality", iValue) )
-    {
-        m_engine->SetTextureQuality(iValue);
-    }
-
     if ( GetConfigFile().GetIntProperty("Setup", "AudioVolume", iValue) )
     {
         m_sound->SetAudioVolume(iValue);
@@ -5174,11 +5131,6 @@ void CMainDialog::ChangeSetupQuality(int quality)
     if ( quality >  0 )  value = 1.0f;
     m_engine->SetGadgetQuantity(value);
 
-    if ( quality <  0 )  iValue = 0;
-    if ( quality == 0 )  iValue = 1;
-    if ( quality >  0 )  iValue = 2;
-    m_engine->SetTextureQuality(iValue);
-
     // TODO: first execute adapt?
     //m_engine->FirstExecuteAdapt(false);
 }