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

vidya music workaround + some shit i forgot

Browse Source
This commit is contained in:
Headshot 2019-04-26 12:46:39 -04:30
parent 116488a231
commit 1e8b7655b6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gameview.py
View File

@ -164,11 +164,10 @@ class AOCharMovie(QtGui.QLabel):
self.m_flipped = flip self.m_flipped = flip
def play(self, p_char, p_emote, emote_prefix): def play(self, p_char, p_emote, emote_prefix):
print p_emote
if p_emote[0] == "/" or p_emote[0] == "\\": if p_emote[0] == "/" or p_emote[0] == "\\":
p_emote = p_emote[1:] p_emote = p_emote[1:]
elif "../../characters" in p_emote: elif "../../characters" in p_emote:
print p_emote
a = p_emote.split("/") a = p_emote.split("/")
p_char = a[3] p_char = a[3]
emote = a[4] emote = a[4]
@ -1953,6 +1952,9 @@ class gui(QtGui.QWidget):
BASS_ChannelPlay(self.sound, True) BASS_ChannelPlay(self.sound, True)
def playMusic(self, mus): def playMusic(self, mus):
if not mus.endswith(".mp3") and "MUSIC START" in self.musiclist: #vidya workaround
mus += ".mp3"
if self.music: if self.music:
if BASS_ChannelIsActive(self.music): if BASS_ChannelIsActive(self.music):
BASS_ChannelStop(self.music) BASS_ChannelStop(self.music)

4
mainmenu.py
View File

@ -389,7 +389,9 @@ class lobby(QtGui.QWidget):
continue continue
del network[0] del network[0]
del network[len(network)-1] del network[len(network)-1]
musiclist = [ music for music in network ]
musiclist = [music for music in network]
self.connectprogress.setText('Finishing...') self.connectprogress.setText('Finishing...')
self.tcp.send('RD#%') self.tcp.send('RD#%')
print '[client]', 'received songs (%d)' % len(musiclist) print '[client]', 'received songs (%d)' % len(musiclist)