diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-09-09 23:11:23 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-09-09 23:11:23 +0300 |
commit | e3dabb7f0a22c6442dde5f261d3414f9e7369592 (patch) | |
tree | 494dbbaeb834f8278f840a996fe9d3dd53f96e1f /src/gui/setup_video.cpp | |
parent | 703a3c4df3732e3e88559147001260f3355d42d6 (diff) | |
download | manaplus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.gz manaplus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.bz2 manaplus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.xz manaplus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.zip |
Last fix part of shadow variables/methods errors.
Diffstat (limited to 'src/gui/setup_video.cpp')
-rw-r--r-- | src/gui/setup_video.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index bc210075a..e0f03ec60 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -687,12 +687,12 @@ void Setup_Video::action(const gcn::ActionEvent &event) } else if (id == "fpslimitcheckbox" || id == "fpslimitslider") { - int fps = static_cast<int>(mFpsSlider->getValue()); + int tempFps = static_cast<int>(mFpsSlider->getValue()); if (id == "fpslimitcheckbox" && !mFpsSlider->isEnabled()) - fps = 60; + tempFps = 60; else - fps = fps > 0 ? fps : 60; - mFps = mFpsCheckBox->isSelected() ? fps : 0; + tempFps = tempFps > 0 ? tempFps : 60; + mFps = mFpsCheckBox->isSelected() ? tempFps : 0; const std::string text = mFps > 0 ? toString(mFps) : _("None"); mFpsLabel->setCaption(text); @@ -701,9 +701,9 @@ void Setup_Video::action(const gcn::ActionEvent &event) } else if (id == "altfpslimitslider") { - int fps = static_cast<int>(mAltFpsSlider->getValue()); - fps = fps > 0 ? fps : static_cast<int>(mAltFpsSlider->getScaleStart()); - mAltFps = fps; + int tempFps = static_cast<int>(mAltFpsSlider->getValue()); + tempFps = tempFps > 0 ? tempFps : static_cast<int>(mAltFpsSlider->getScaleStart()); + mAltFps = tempFps; const std::string text = mAltFps > 0 ? toString(mAltFps) : _("None"); mAltFpsLabel->setCaption(_("Alt FPS limit: ") + text); |