summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2006-05-05 16:21:32 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2006-05-05 16:21:32 +0000
commit6c0e78de6eb137e75473e056eec238cd31b9e901 (patch)
tree1fd9fa2a7a214485b00792aacb82953043a53643
parentb344f63a95e236ffd062608dd5a320a542946d75 (diff)
downloadmana-6c0e78de6eb137e75473e056eec238cd31b9e901.tar.gz
mana-6c0e78de6eb137e75473e056eec238cd31b9e901.tar.bz2
mana-6c0e78de6eb137e75473e056eec238cd31b9e901.tar.xz
mana-6c0e78de6eb137e75473e056eec238cd31b9e901.zip
Fixed some numeric conversions.
-rw-r--r--ChangeLog6
-rw-r--r--src/gui/setup_video.cpp4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 479aa47f..72e2ef70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2006-05-03 Eugenio Favalli <elvenprogrammer@gmail.com>
+2006-05-05 Eugenio Favalli <elvenprogrammer@gmail.com>
+
+ * src/gui/setup_video.cpp: Fixed some numeric conversions.
+
+2006-05-03 Eugenio Favalli <elvenprogrammer@gmail.com>
* configure.ac, src/game.cpp, src/graphics.cpp, src/main.cpp,
src/openglgraphics.cpp, The Mana World: Increased fps limit granularity
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index cf50b98c..d6289bbc 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -250,14 +250,14 @@ void Setup_Video::action(const std::string &event)
}
else if (event == "fpslimitslider")
{
- mFps = mFpsSlider->getValue();
+ mFps = (int)mFpsSlider->getValue();
mFpsField->setText(toString(mFps));
}
else if (event == "fpslimitcheckbox")
{
if (mFpsCheckBox->isMarked())
{
- mFps = mFpsSlider->getValue();
+ mFps = (int)mFpsSlider->getValue();
}
else
{