summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Rohdewald <wolfgang@rohdewald.de>2016-08-11 13:42:19 (GMT)
committerWolfgang Rohdewald <wolfgang@rohdewald.de>2016-08-24 10:26:50 (GMT)
commit62cbdaf3c3529d5ed8ade937e4642f02bac0b087 (patch)
treeb03bea715cc7e4786c040da38b93d79c3a38a55c
parent4b7f8fea3752c54b86777d31609be342aaaf64e3 (diff)
--nogui implies no sound
-rw-r--r--src/message.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/message.py b/src/message.py
index 0610447..0987ed3 100644
--- a/src/message.py
+++ b/src/message.py
@@ -24,7 +24,7 @@ from log import m18n, m18nc, m18ncE, logWarning, logException, logDebug
from sound import Voice, Sound
from tile import Tile, TileList
from meld import Meld, MeldList
-from common import Internal, Debug, long
+from common import Internal, Debug, Options, long
from common import unicode, unicodeString, StrMixin
from dialogs import Sorry
@@ -612,7 +612,7 @@ class MessageVoiceId(ServerMessage):
def clientAction(self, dummyClient, move):
"""the server gave us a voice id about another player"""
- if Internal.Preferences.useSounds:
+ if Internal.Preferences.useSounds and Options.gui:
move.player.voice = Voice.locate(move.source)
if not move.player.voice:
return Message.ClientWantsVoiceData, move.source
@@ -635,7 +635,7 @@ class MessageAssignVoices(ServerMessage):
"""The server tells us that we now got all voice data available"""
def clientAction(self, client, move):
- if Internal.Preferences.useSounds:
+ if Internal.Preferences.useSounds and Options.gui:
client.game.assignVoices()