Add vsync option.

1 files changed, 14 insertions, 0 deletions

diff --git a/src/client.cpp b/src/client.cpp
index b853f1908..242bb2f21 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -564,6 +564,7 @@ void Client::gameInit()
 
     applyGrabMode();
     applyGamma();
+    applyVSync();
 
     // Initialize for drawing
     mainGraphics->_beginDraw();
@@ -668,6 +669,7 @@ void Client::gameInit()
     config.addListener("guialpha", this);
     config.addListener("gamma", this);
     config.addListener("particleEmitterSkip", this);
+    config.addListener("vsync", this);
     setGuiAlpha(config.getFloatValue("guialpha"));
 
     optionChanged("fpslimit");
@@ -709,6 +711,7 @@ void Client::gameClear()
     config.removeListener("guialpha", this);
     config.removeListener("gamma", this);
     config.removeListener("particleEmitterSkip", this);
+    config.removeListener("vsync", this);
 
     SDL_RemoveTimer(mLogicCounterId);
     SDL_RemoveTimer(mSecondsCounterId);
@@ -1507,6 +1510,10 @@ void Client::optionChanged(const std::string &name)
     {
         Particle::emitterSkip = config.getIntValue("particleEmitterSkip") + 1;
     }
+    else if (name == "vsync")
+    {
+        applyVSync();
+    }
 }
 
 void Client::action(const gcn::ActionEvent &event)
@@ -2457,3 +2464,10 @@ void Client::applyGamma()
     float val = config.getFloatValue("gamma");
     SDL_SetGamma(val, val, val);
 }
+
+void Client::applyVSync()
+{
+    int val = config.getIntValue("vsync");
+    if (val > 0 && val < 2)
+        SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, val);
+}