diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/gui/chat.cpp | 2 | ||||
| -rw-r--r-- | src/gui/chat.h | 2 | ||||
| -rw-r--r-- | src/gui/viewport.cpp | 8 |
5 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2008-07-14 Roderic Morris <roderic@ccs.neu.edu> + + * src/CMakeLists.txt: Added the partyhandler to the cmake build list. + * src/gui/viewport.cpp: Reverse the effect of visible names. + * src/gui/chat.cpp, src/gui/chat.h: Cosmetic changes to a hack. + 2008-07-14 David Athay <ko2fan@gmail.com> * src/game.cpp, src/commandhandler.cpp, src/game.h: Added admin commands diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ce322bdc..117ca7a9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -241,6 +241,8 @@ SET(SRCS net/network.h net/npchandler.cpp net/npchandler.h + net/partyhandler.cpp + net/partyhandler.h net/playerhandler.cpp net/playerhandler.h net/protocol.h diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index ad5e0c9b..b7c63247 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -155,7 +155,7 @@ void ChatWindow::logic() void ChatWindow::chatLog(std::string line, int own, std::string channelName) { - if(channelName == "getFocused\"") + if(channelName.empty()) channelName = getFocused(); ChannelMap::const_iterator chan = mChannels.find(channelName); diff --git a/src/gui/chat.h b/src/gui/chat.h index e0e61ce5..3923e097 100644 --- a/src/gui/chat.h +++ b/src/gui/chat.h @@ -95,7 +95,7 @@ class ChatWindow : public Window, */ void chatLog(std::string line, int own = BY_SERVER, - std::string channelName = "getFocused\""); + std::string channelName = ""); /** * Performs action. 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); } } |