diff options
| author | Roderic Morris <roderic@ccs.neu.edu> | 2008-07-14 23:15:10 +0000 |
|---|---|---|
| committer | Roderic Morris <roderic@ccs.neu.edu> | 2008-07-14 23:15:10 +0000 |
| commit | 1e5a8a201f59cb54f725ac4660a41013bcd768cf (patch) | |
| tree | d0edea7722cc2d15acea776a5239c313b852e525 /src/gui/viewport.cpp | |
| parent | 993b43e87e2d53e8ae8ea31c43f04a19613a6d09 (diff) | |
| download | Mana-1e5a8a201f59cb54f725ac4660a41013bcd768cf.tar.gz Mana-1e5a8a201f59cb54f725ac4660a41013bcd768cf.tar.bz2 Mana-1e5a8a201f59cb54f725ac4660a41013bcd768cf.tar.xz Mana-1e5a8a201f59cb54f725ac4660a41013bcd768cf.zip | |
fix view names checkbox, fix compilation with cmake
Diffstat (limited to 'src/gui/viewport.cpp')
| -rw-r--r-- | src/gui/viewport.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 11dbb146..9677f81a 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -68,7 +68,7 @@ Viewport::Viewport(): mScrollRadius = (int) config.getValue("ScrollRadius", 32); mScrollCenterOffsetX = (int) config.getValue("ScrollCenterOffsetX", 0); mScrollCenterOffsetY = (int) config.getValue("ScrollCenterOffsetY", 0); - mVisibleNames = (config.getValue("visiblenames", 1) == 1); + mVisibleNames = config.getValue("visiblenames", 1); config.addListener("ScrollLaziness", this); config.addListener("ScrollRadius", this); @@ -239,9 +239,9 @@ Viewport::draw(gcn::Graphics *gcnGraphics) for (BeingIterator i = beings.begin(); i != beings.end(); i++) { (*i)->drawSpeech(graphics, -(int) mViewX, -(int) mViewY); - if(mVisibleNames && (*i) == mSelectedBeing) + if(mVisibleNames) (*i)->drawName(graphics, -(int) mViewX, -(int) mViewY); - else if(!mVisibleNames) + else if((*i) == mSelectedBeing) (*i)->drawName(graphics, -(int) mViewX, -(int) mViewY); (*i)->drawEmotion(graphics, -(int) mViewX, -(int) mViewY); } @@ -469,7 +469,7 @@ Viewport::optionChanged(const std::string &name) mScrollRadius = (int) config.getValue("ScrollRadius", 32); if (name == "visiblenames") { - mVisibleNames = config.getValue("visiblenames", 1) == 1; + mVisibleNames = config.getValue("visiblenames", 1); } } |