summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-06-16 07:04:46 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-06-16 07:04:46 +0000
commit061f0dd698c40afa367db8b129c5ae319e92aade (patch)
tree0008c9521f5345514d43cc12c53189791cc18197 /src
parent3fcb588f254ccf5869842dfd1965decaf2008817 (diff)
downloadMana-061f0dd698c40afa367db8b129c5ae319e92aade.tar.gz
Mana-061f0dd698c40afa367db8b129c5ae319e92aade.tar.bz2
Mana-061f0dd698c40afa367db8b129c5ae319e92aade.tar.xz
Mana-061f0dd698c40afa367db8b129c5ae319e92aade.zip
Allow whispers by default (patch by Fate).
Diffstat (limited to 'src')
-rw-r--r--src/gui/setup_players.cpp2
-rw-r--r--src/player_relations.h2
2 files changed, 2 insertions, 2 deletions
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,