diff --git a/audio.py b/audio.py index 074a745..f1012f3 100644 --- a/audio.py +++ b/audio.py @@ -57,13 +57,13 @@ Initialize BASS and the opus plugin import pybass.pybassmidi as bassmidi if not dll.BASS_Init(ini.read_ini_int("AO2XP.ini", "Audio", "device", -1), freq, 0, 0, 0): - print "[audio] Audio library could not be initialized. Error", self.getbasserror() + print "[audio] Audio library could not be initialized. Error", getbasserror() if not dll.BASS_PluginLoad(os.path.abspath(opus), 0): - print "[audio] Opus plugin failed to load. Error", self.getbasserror() + print "[audio] Opus plugin failed to load. Error", getbasserror() if not dll.BASS_PluginLoad(os.path.abspath(flac), 0): - print "[audio] FLAC plugin failed to load. Error", self.getbasserror() + print "[audio] FLAC plugin failed to load. Error", getbasserror() if not dll.BASS_PluginLoad(os.path.abspath(midi), 0): - print "[audio] MIDI plugin failed to load. Error", self.getbasserror() + print "[audio] MIDI plugin failed to load. Error", getbasserror() if os.path.exists(os.path.abspath("gm.sf2")): dll.BASS_SetConfigPtr(bassmidi.BASS_CONFIG_MIDI_DEFFONT, "gm.sf2"); diff --git a/gameview.py b/gameview.py index 9aec29a..5dd75d0 100644 --- a/gameview.py +++ b/gameview.py @@ -968,7 +968,7 @@ class gui(QtGui.QWidget): # AO 2.8 self.additivebtn = QtGui.QCheckBox(self) self.additivebtn.setChecked(False) - self.additivebtn.setText('Additive text') + self.additivebtn.setText('Additive') self.additivebtn.resize(self.additivebtn.sizeHint()) self.additivebtn.move(self.nointerruptbtn.x(), self.sfxbutton.y()) self.additivebtn.clicked.connect(self.onAdditiveCheck) @@ -1353,7 +1353,10 @@ class gui(QtGui.QWidget): effectslist.insert(0, "No effect") self.effectdropdown.addItems(effectslist) - charname = unicode(charname.toLower()) + if isinstance(charname, str): + charname = unicode(charname.lower()) + elif isinstance(charname, QtCore.QString): + charname = unicode(charname.toLower()) self.charname = ini.read_ini(AOpath + 'characters/' + charname + '/char.ini', "options", "name", charname).decode('utf-8').lower() self.charside = ini.read_ini(AOpath + 'characters/' + charname + '/char.ini', "options", "side", "def") @@ -2683,7 +2686,7 @@ class gui(QtGui.QWidget): else: self.icLog.append(logstart) - self.setBackground(background) + self.setBackground(background.lower()) for msg in oocjoin: self.ooclog.append(msg)