diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/gui/setup_players.cpp | 2 | ||||
| -rw-r--r-- | src/player_relations.h | 2 |
3 files changed, 9 insertions, 4 deletions
@@ -1,7 +1,12 @@ +2008-06-16 Fate <fate.tmw@googlemail.com> + + * player_relations.h: Allow whispers by default. + 2008-06-14 David Athay <ko2fan@gmail.com> - * src/gui/shop.cpp, src/gui/browserbox.cpp, src/net/tradehandler.cpp: Fixed - compilation errors. Fixed trade bug (although a little hacky right now). + * src/gui/shop.cpp, src/gui/browserbox.cpp, src/net/tradehandler.cpp: + Fixed compilation errors. Fixed trade bug (although a little hacky + right now). * src/net/tradehandler.cpp: Changed bug fix as requested by Bjørn. 2008-06-08 Fate <fate.tmw@googlemail.com> diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp index 20a225b8..24b559da 100644 --- a/src/gui/setup_players.cpp +++ b/src/gui/setup_players.cpp @@ -205,7 +205,7 @@ Setup_Players::Setup_Players(): mPlayerScrollArea(new ScrollArea(mPlayerTable)), mPersistIgnores(new CheckBox("save player list", player_relations.getPersistIgnores())), mDefaultTrading(new CheckBox("allow trading", player_relations.getDefault() & PlayerRelation::TRADE)), - mDefaultWhisper(new CheckBox("allow whispers", player_relations.getDefault() & PlayerRelation:: WHISPER)), + mDefaultWhisper(new CheckBox("allow whispers", player_relations.getDefault() & PlayerRelation::WHISPER)), mDeleteButton(new Button("Delete", ACTION_DELETE, this)), mIgnoreActionChoicesBox(new gcn::DropDown(new IgnoreChoicesListModel())) { diff --git a/src/player_relations.h b/src/player_relations.h index 99c16020..6e7d1f9d 100644 --- a/src/player_relations.h +++ b/src/player_relations.h @@ -44,7 +44,7 @@ struct PlayerRelation static const unsigned int DEFAULT = EMOTE | SPEECH_FLOAT | SPEECH_LOG -// | WHISPER -- only for friends + | WHISPER | TRADE; enum relation { NEUTRAL = 0, |