diff options
| author | peavey <peavey@inspircd.org> | 2009-05-10 22:27:24 +0200 |
|---|---|---|
| committer | peavey <peavey@inspircd.org> | 2009-05-10 22:27:24 +0200 |
| commit | b5e8d34910b4595b40f1210fbdd06a3a0bd9b7b7 (patch) | |
| tree | c3d1f373528e4de0f35f4c9021c60f8805fd3545 /src/gui | |
| parent | e6c1af6d47aa79f02e0bf20ade42158511f25c69 (diff) | |
| parent | cba524cbd0641cdf9e2e19eda453ab7518d8dca0 (diff) | |
| download | mana-b5e8d34910b4595b40f1210fbdd06a3a0bd9b7b7.tar.gz mana-b5e8d34910b4595b40f1210fbdd06a3a0bd9b7b7.tar.bz2 mana-b5e8d34910b4595b40f1210fbdd06a3a0bd9b7b7.tar.xz mana-b5e8d34910b4595b40f1210fbdd06a3a0bd9b7b7.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/partywindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/setup_video.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp index 0479f0fe..dbd8f3ef 100644 --- a/src/gui/partywindow.cpp +++ b/src/gui/partywindow.cpp @@ -51,7 +51,7 @@ PartyWindow::PartyWindow() : setCloseButton(true); setMinWidth(200); setMinHeight(200); - setDefaultSize(620, 300, 200, 200); + setDefaultSize(590, 200, 200, 200); loadWindowState(); setVisible(false); // Do not start out visible diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 8aa5c9fd..bbbeb6d7 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -100,7 +100,7 @@ ModeListModel::ModeListModel() for (int i = 0; modes[i]; ++i) { const std::string modeString = - toString((int)modes[i]->w) + "x" + toString((int)modes[i]->h); + toString((int)modes[i]->w) + "x" + toString((int) modes[i]->h); //logger->log(modeString.c_str()); mVideoModes.push_back(modeString); } @@ -145,7 +145,7 @@ Setup_Video::Setup_Video(): mPickupParticleEnabled(config.getValue("showpickupparticle", false)), mOpacity(config.getValue("guialpha", 0.8)), mFps((int) config.getValue("fpslimit", 60)), - mSpeechMode((int) config.getValue("speech", 3)), + mSpeechMode((int) config.getValue("speech", Being::TEXT_OVERHEAD)), mModeListModel(new ModeListModel), mModeList(new ListBox(mModeListModel)), mFsCheckBox(new CheckBox(_("Full screen"), mFullScreenEnabled)), @@ -446,7 +446,7 @@ void Setup_Video::apply() mVisibleNamesEnabled = config.getValue("visiblenames", true); mParticleEffectsEnabled = config.getValue("particleeffects", true); mNameEnabled = config.getValue("showownname", false); - mSpeechMode = (int) config.getValue("speech", 3); + mSpeechMode = (int) config.getValue("speech", Being::TEXT_OVERHEAD); mOpacity = config.getValue("guialpha", 0.8); mOverlayDetail = (int) config.getValue("OverlayDetail", 2); mOpenGLEnabled = config.getValue("opengl", false); |