diff --git a/gameview.py b/gameview.py index f75efb2..1de477a 100644 --- a/gameview.py +++ b/gameview.py @@ -651,8 +651,6 @@ class gui(QtGui.QWidget): chatmsg = '' charid = -1 - wtcesfx = None - #ICchat = QtCore.pyqtSignal(str, str, str, str, str, str, int, int, int, int, int, int, int, int) #ICchat = QtCore.pyqtSignal(list) WTCEsignal = QtCore.pyqtSignal(str, int) @@ -1066,6 +1064,10 @@ class gui(QtGui.QWidget): self.setBackground('default') self.charselect = charselect.charselect(self) + + #self.wtcesfx = 0 + #self.guiltysfx = 0 + #self.notguiltysfx = 0 def resetOffsets(self): self.pairoffset.setValue(0) @@ -1135,9 +1137,9 @@ class gui(QtGui.QWidget): if self.sound: audio.sethandleattr(self.sound, BASS_ATTRIB_VOL, value / 100.0) audio.sethandleattr(self.realizationsnd, BASS_ATTRIB_VOL, value / 100.0) - audio.sethandleattr(self.wtcesfx, BASS_ATTRIB_VOL, value / 100.0) - audio.sethandleattr(self.guiltysfx, BASS_ATTRIB_VOL, value / 100.0) - audio.sethandleattr(self.notguiltysfx, BASS_ATTRIB_VOL, value / 100.0) + #audio.sethandleattr(self.wtcesfx, BASS_ATTRIB_VOL, value / 100.0) + #audio.sethandleattr(self.guiltysfx, BASS_ATTRIB_VOL, value / 100.0) + #audio.sethandleattr(self.notguiltysfx, BASS_ATTRIB_VOL, value / 100.0) if self.modcall: audio.sethandleattr(self.modcall, BASS_ATTRIB_VOL, value / 100.0) @@ -1760,9 +1762,10 @@ class gui(QtGui.QWidget): evidence = int(self.m_chatmessage[EVIDENCE])-1 t = time.localtime() - logcharname = f_char - if f_char.lower() != self.charlist[f_char_id][0].lower(): - logcharname = self.charlist[f_char_id][0] + ' (' + f_char.decode("utf-8") + ')' + logcharname = f_char.decode("utf-8") + #TODO: UnicodeWarning: Unicode unequal comparison failed to convert both arguments to Unicode - interpreting them as being unequal + #if f_char.lower() != self.charlist[f_char_id][0].lower(): + # logcharname = self.charlist[f_char_id][0] + ' (' + f_char.decode("utf-8") + ')' if self.m_chatmessage[SHOWNAME]: try: