diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-10 21:55:41 +0200 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-10 21:55:41 +0200 |
| commit | 8bd92398316cb308c680cd1a1d4b3dd4f049b450 (patch) | |
| tree | 209cb0b8e50d4f2f32c1db17ed6dee20bec1463d | |
| parent | 9dc642f3e0d47f1cc0c55493beb5e25af0ceea15 (diff) | |
| download | mana-8bd92398316cb308c680cd1a1d4b3dd4f049b450.tar.gz mana-8bd92398316cb308c680cd1a1d4b3dd4f049b450.tar.bz2 mana-8bd92398316cb308c680cd1a1d4b3dd4f049b450.tar.xz mana-8bd92398316cb308c680cd1a1d4b3dd4f049b450.zip | |
Made overhead text the default instead of the bubbles
This is most similar to the way 0.0.28.1 was, and the bubbles still have
some style and readability issues.
| -rw-r--r-- | src/being.cpp | 4 | ||||
| -rw-r--r-- | src/gui/setup_video.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/being.cpp b/src/being.cpp index 4c4706db..2b31e9ec 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -396,7 +396,7 @@ void Being::setSpeech(const std::string &text, int time) if (!mSpeech.empty()) mSpeechTime = time <= SPEECH_MAX_TIME ? time : SPEECH_MAX_TIME; - const int speech = (int) config.getValue("speech", NAME_IN_BUBBLE); + const int speech = (int) config.getValue("speech", TEXT_OVERHEAD); if (speech == TEXT_OVERHEAD) { if (mText) @@ -776,7 +776,7 @@ void Being::drawSpeech(int offsetX, int offsetY) { const int px = mPx - offsetX; const int py = mPy - offsetY; - const int speech = (int) config.getValue("speech", NAME_IN_BUBBLE); + const int speech = (int) config.getValue("speech", TEXT_OVERHEAD); // Draw speech above this being if (mSpeechTime == 0) 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); |