cidoku/AO2XP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master'

Browse Source
This commit is contained in:
simio 2025-02-20 00:32:06 -03:00
commit f9ffccde12
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio.py
View File

@ -54,7 +54,7 @@ Initialize BASS and the opus plugin
use_ctypes = True use_ctypes = True
else: else:
import pybass as dll import pybass as dll
import pybass.pybassmidi as bassmidi #import pybass.pybassmidi as bassmidi
if not dll.BASS_Init(ini.read_ini_int("AO2XP.ini", "Audio", "device", -1), freq, 0, 0, 0): 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", getbasserror() print "[audio] Audio library could not be initialized. Error", getbasserror()

5
gameview.py
View File

@ -1511,7 +1511,9 @@ class gui(QtGui.QWidget):
self.emotebuttons[n_emote].setPixmap(image) self.emotebuttons[n_emote].setPixmap(image)
self.emotebuttons[n_emote].show() self.emotebuttons[n_emote].show()
self.emotebuttons[n_emote].setToolTip(self.charemotes[n_emote + self.current_emote_page * self.max_emotes_on_page][0])
def iniswap_index_change(self, ind): def iniswap_index_change(self, ind):
self.iniswapindex = ind self.iniswapindex = ind
@ -2941,7 +2943,6 @@ class gui(QtGui.QWidget):
break break
if coincidence > -1: if coincidence > -1:
print(coincidence)
self.tcp.send("CC#0#"+str(coincidence)+"#ur mom gay#%") self.tcp.send("CC#0#"+str(coincidence)+"#ur mom gay#%")
else: else:
self.charselect.show() self.charselect.show()