summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-12-14 21:57:38 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-12-14 21:57:38 +0100
commit3dba40474d5b1525e8723139ae7be7576967feea (patch)
treece1fe17e358bbd5502aa6c721aeba92cc1c47d73
parent34a02000cacc2c553d11e19c09d9d11b9c46eafd (diff)
downloadmana-3dba40474d5b1525e8723139ae7be7576967feea.tar.gz
mana-3dba40474d5b1525e8723139ae7be7576967feea.tar.bz2
mana-3dba40474d5b1525e8723139ae7be7576967feea.tar.xz
mana-3dba40474d5b1525e8723139ae7be7576967feea.zip
Tweaked some configuration defaults
Scrolling is now a bit less lazy and the scroll radius is 0. In my opinion this is a better default. Framerate limiter is now off by default, since it makes the game appear a bit choppy. It's basically only useful for laptops anyway, and not too hard to find. (cherry picked from eAthena branch, commit c56bc78b5f5676784265dff8ed5334884e8dcc39) Conflicts: src/main.cpp
-rw-r--r--src/gui/setup_video.cpp14
-rw-r--r--src/gui/viewport.cpp4
2 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index d9d6f34a..bac342a0 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -106,8 +106,8 @@ Setup_Video::Setup_Video():
mCustomCursorEnabled(config.getValue("customcursor", 1)),
mVisibleNamesEnabled(config.getValue("visiblenames", 1)),
mOpacity(config.getValue("guialpha", 0.8)),
- mFps((int)config.getValue("fpslimit", 60)),
- mModeListModel(new ModeListModel()),
+ mFps((int) config.getValue("fpslimit", 0)),
+ mModeListModel(new ModeListModel),
mModeList(new ListBox(mModeListModel)),
mFsCheckBox(new CheckBox(_("Full screen"), mFullScreenEnabled)),
mOpenGLCheckBox(new CheckBox(_("OpenGL"), mOpenGLEnabled)),
@@ -116,13 +116,13 @@ Setup_Video::Setup_Video():
mAlphaSlider(new Slider(0.2, 1.0)),
mFpsCheckBox(new CheckBox(_("FPS Limit:"))),
mFpsSlider(new Slider(10, 200)),
- mFpsField(new TextField()),
- mOriginalScrollLaziness((int) config.getValue("ScrollLaziness", 32)),
+ mFpsField(new TextField),
+ mOriginalScrollLaziness((int) config.getValue("ScrollLaziness", 16)),
mScrollLazinessSlider(new Slider(1, 64)),
- mScrollLazinessField(new TextField()),
- mOriginalScrollRadius((int) config.getValue("ScrollRadius", 32)),
+ mScrollLazinessField(new TextField),
+ mOriginalScrollRadius((int) config.getValue("ScrollRadius", 0)),
mScrollRadiusSlider(new Slider(0, 128)),
- mScrollRadiusField(new TextField()),
+ mScrollRadiusField(new TextField),
mOverlayDetail((int) config.getValue("OverlayDetail", 2)),
mOverlayDetailSlider(new Slider(0, 2)),
mOverlayDetailField(new gcn::Label(""))
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index a6092c7a..a746fb03 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -61,8 +61,8 @@ Viewport::Viewport():
setOpaque(false);
addMouseListener(this);
- mScrollLaziness = (int) config.getValue("ScrollLaziness", 32);
- mScrollRadius = (int) config.getValue("ScrollRadius", 32);
+ mScrollLaziness = (int) config.getValue("ScrollLaziness", 16);
+ mScrollRadius = (int) config.getValue("ScrollRadius", 0);
mScrollCenterOffsetX = (int) config.getValue("ScrollCenterOffsetX", 0);
mScrollCenterOffsetY = (int) config.getValue("ScrollCenterOffsetY", 0);
mVisibleNames = config.getValue("visiblenames", 1);