1 files changed, 3 insertions, 104 deletions

diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 709a7685..ac419de5 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -26,7 +26,6 @@
 #include "game.h"
 #include "graphics.h"
 #include "localplayer.h"
-#include "particle.h"
 
 #include "gui/okdialog.h"
 
@@ -95,7 +94,7 @@ ModeListModel::ModeListModel()
             continue;
 
         // Skip the unreasonably small modes
-        if (mode.w < 640 || mode.h < 480)
+        if (mode.w < 640 || mode.h < 360)
             continue;
 
         // TODO_SDL2: Modes now dinstinguish between pixel format and refresh rate as well
@@ -114,40 +113,10 @@ int ModeListModel::getIndexOf(const std::string &widthXHeightMode)
     return -1;
 }
 
-const char *Setup_Video::overlayDetailToString(int detail)
-{
-    if (detail == -1)
-        detail = config.getIntValue("OverlayDetail");
-
-    switch (detail)
-    {
-        case 0: return _("off");
-        case 1: return _("low");
-        case 2: return _("high");
-    }
-    return "";
-}
-
-const char *Setup_Video::particleDetailToString(int detail)
-{
-    if (detail == -1)
-        detail = 3 - config.getIntValue("particleEmitterSkip");
-
-    switch (detail)
-    {
-        case 0: return _("low");
-        case 1: return _("medium");
-        case 2: return _("high");
-        case 3: return _("max");
-    }
-    return "";
-}
-
 Setup_Video::Setup_Video():
     mFullScreenEnabled(config.getBoolValue("screen")),
     mOpenGLEnabled(config.getBoolValue("opengl")),
     mCustomCursorEnabled(config.getBoolValue("customcursor")),
-    mParticleEffectsEnabled(config.getBoolValue("particleeffects")),
     mFps(config.getIntValue("fpslimit")),
     mSDLTransparencyDisabled(config.getBoolValue("disableTransparency")),
     mModeListModel(new ModeListModel),
@@ -156,17 +125,9 @@ Setup_Video::Setup_Video():
     mOpenGLCheckBox(new CheckBox(_("OpenGL"), mOpenGLEnabled)),
     mCustomCursorCheckBox(new CheckBox(_("Custom cursor"),
                                        mCustomCursorEnabled)),
-    mParticleEffectsCheckBox(new CheckBox(_("Particle effects"),
-                                          mParticleEffectsEnabled)),
     mFpsCheckBox(new CheckBox(_("FPS limit:"))),
     mFpsSlider(new Slider(10, 120)),
     mFpsLabel(new Label),
-    mOverlayDetail(config.getIntValue("OverlayDetail")),
-    mOverlayDetailSlider(new Slider(0, 2)),
-    mOverlayDetailField(new Label),
-    mParticleDetail(3 - config.getIntValue("particleEmitterSkip")),
-    mParticleDetailSlider(new Slider(0, 3)),
-    mParticleDetailField(new Label),
     mDisableSDLTransparencyCheckBox(
                           new CheckBox(_("Disable transparency (Low CPU mode)"),
                                        mSDLTransparencyDisabled))
@@ -179,9 +140,6 @@ Setup_Video::Setup_Video():
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     scrollArea->setSize(100, 200);
 
-    overlayDetailLabel = new Label(_("Ambient FX:"));
-    particleDetailLabel = new Label(_("Particle detail:"));
-
     mModeList->setEnabled(true);
 
 #ifndef USE_OPENGL
@@ -194,9 +152,6 @@ Setup_Video::Setup_Video():
     mFpsSlider->setEnabled(mFps > 0);
     mFpsCheckBox->setSelected(mFps > 0);
 
-    overlayDetailLabel->setAlignment(Graphics::RIGHT);
-    particleDetailLabel->setAlignment(Graphics::RIGHT);
-
     // If the openGL Mode is enabled, disabling the transaprency
     // is irrelevant.
     mDisableSDLTransparencyCheckBox->setEnabled(!mOpenGLEnabled);
@@ -209,34 +164,18 @@ Setup_Video::Setup_Video():
     // Set actions
     mModeList->setActionEventId("videomode");
     mCustomCursorCheckBox->setActionEventId("customcursor");
-    mParticleEffectsCheckBox->setActionEventId("particleeffects");
     mDisableSDLTransparencyCheckBox->setActionEventId("disableTransparency");
     mFpsCheckBox->setActionEventId("fpslimitcheckbox");
     mFpsSlider->setActionEventId("fpslimitslider");
-    mOverlayDetailSlider->setActionEventId("overlaydetailslider");
-    mOverlayDetailField->setActionEventId("overlaydetailfield");
     mOpenGLCheckBox->setActionEventId("opengl");
-    mParticleDetailSlider->setActionEventId("particledetailslider");
-    mParticleDetailField->setActionEventId("particledetailfield");
 
     // Set listeners
     mModeList->addActionListener(this);
     mCustomCursorCheckBox->addActionListener(this);
     mOpenGLCheckBox->addActionListener(this);
-    mParticleEffectsCheckBox->addActionListener(this);
     mDisableSDLTransparencyCheckBox->addActionListener(this);
     mFpsCheckBox->addActionListener(this);
     mFpsSlider->addActionListener(this);
-    mOverlayDetailSlider->addActionListener(this);
-    mOverlayDetailField->addKeyListener(this);
-    mParticleDetailSlider->addActionListener(this);
-    mParticleDetailField->addKeyListener(this);
-
-    mOverlayDetailField->setCaption(overlayDetailToString(mOverlayDetail));
-    mOverlayDetailSlider->setValue(mOverlayDetail);
-
-    mParticleDetailField->setCaption(particleDetailToString(mParticleDetail));
-    mParticleDetailSlider->setValue(mParticleDetail);
 
     // Do the layout
     ContainerPlacer place = getPlacer(0, 0);
@@ -257,16 +196,6 @@ Setup_Video::Setup_Video():
     place(0, 2, mFpsCheckBox);
     place(1, 2, mFpsSlider, 2);
     place(3, 2, mFpsLabel);
-
-    place(0, 3, mParticleEffectsCheckBox, 4);
-
-    place(0, 4, particleDetailLabel);
-    place(1, 4, mParticleDetailSlider, 2);
-    place(3, 4, mParticleDetailField);
-
-    place(0, 5, overlayDetailLabel);
-    place(1, 5, mOverlayDetailSlider, 2);
-    place(3, 5, mOverlayDetailField);
 }
 
 Setup_Video::~Setup_Video()
@@ -329,7 +258,8 @@ void Setup_Video::apply()
             }
             else
             {
-                Client::instance()->videoResized(screenWidth, screenHeight);
+                Client::instance()->videoResized(graphics->getWidth(),
+                                                 graphics->getHeight());
 
                 config.setValue("screen", fullscreen);
                 config.setValue("screenwidth", screenWidth);
@@ -387,8 +317,6 @@ void Setup_Video::apply()
     // We sync old and new values at apply time
     mFullScreenEnabled = config.getBoolValue("screen");
     mCustomCursorEnabled = config.getBoolValue("customcursor");
-    mParticleEffectsEnabled = config.getBoolValue("particleeffects");
-    mOverlayDetail = config.getIntValue("OverlayDetail");
     mOpenGLEnabled = config.getBoolValue("opengl");
     mSDLTransparencyDisabled = config.getBoolValue("disableTransparency");
 }
@@ -399,11 +327,8 @@ void Setup_Video::cancel()
     mFsCheckBox->setSelected(mFullScreenEnabled);
     mOpenGLCheckBox->setSelected(mOpenGLEnabled);
     mCustomCursorCheckBox->setSelected(mCustomCursorEnabled);
-    mParticleEffectsCheckBox->setSelected(mParticleEffectsEnabled);
     mFpsSlider->setValue(mFps);
     mFpsSlider->setEnabled(mFps > 0);
-    mOverlayDetailSlider->setValue(mOverlayDetail);
-    mParticleDetailSlider->setValue(mParticleDetail);
     std::string text = mFpsCheckBox->isSelected() ? toString(mFps) : _("None");
     mFpsLabel->setCaption(text);
     mDisableSDLTransparencyCheckBox->setSelected(mSDLTransparencyDisabled);
@@ -417,7 +342,6 @@ void Setup_Video::cancel()
     mModeList->setSelected(mModeListModel->getIndexOf(videoMode));
 
     config.setValue("customcursor", mCustomCursorEnabled);
-    config.setValue("particleeffects", mParticleEffectsEnabled);
     config.setValue("opengl", mOpenGLEnabled);
     config.setValue("disableTransparency", mSDLTransparencyDisabled);
 }
@@ -430,31 +354,6 @@ void Setup_Video::action(const gcn::ActionEvent &event)
     {
         config.setValue("customcursor", mCustomCursorCheckBox->isSelected());
     }
-    else if (id == "particleeffects")
-    {
-        config.setValue("particleeffects",
-                        mParticleEffectsCheckBox->isSelected());
-        Particle::enabled = mParticleEffectsCheckBox->isSelected();
-
-        if (Game::instance())
-        {
-            new OkDialog(_("Particle Effect Settings Changed."),
-                         _("Changes will take effect on map change."));
-        }
-    }
-    else if (id == "overlaydetailslider")
-    {
-        int val = (int) mOverlayDetailSlider->getValue();
-        mOverlayDetailField->setCaption(overlayDetailToString(val));
-        config.setValue("OverlayDetail", val);
-    }
-    else if (id == "particledetailslider")
-    {
-        int val = (int) mParticleDetailSlider->getValue();
-        mParticleDetailField->setCaption(particleDetailToString(val));
-        config.setValue("particleEmitterSkip", 3 - val);
-        Particle::emitterSkip = 4 - val;
-    }
     else if (id == "fpslimitcheckbox" || id == "fpslimitslider")
     {
         int fps = (int) mFpsSlider->getValue();