From 1e8b7655b63eec5b0d60ae3fdad8571137b20271 Mon Sep 17 00:00:00 2001 From: Headshot Date: Fri, 26 Apr 2019 12:46:39 -0430 Subject: [PATCH] vidya music workaround + some shit i forgot --- gameview.py | 6 ++++-- mainmenu.py | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gameview.py b/gameview.py index 1688e08..cdbce89 100644 --- a/gameview.py +++ b/gameview.py @@ -164,11 +164,10 @@ class AOCharMovie(QtGui.QLabel): self.m_flipped = flip def play(self, p_char, p_emote, emote_prefix): - print p_emote - if p_emote[0] == "/" or p_emote[0] == "\\": p_emote = p_emote[1:] elif "../../characters" in p_emote: + print p_emote a = p_emote.split("/") p_char = a[3] emote = a[4] @@ -1953,6 +1952,9 @@ class gui(QtGui.QWidget): BASS_ChannelPlay(self.sound, True) def playMusic(self, mus): + if not mus.endswith(".mp3") and "MUSIC START" in self.musiclist: #vidya workaround + mus += ".mp3" + if self.music: if BASS_ChannelIsActive(self.music): BASS_ChannelStop(self.music) diff --git a/mainmenu.py b/mainmenu.py index 2453755..504c5d5 100644 --- a/mainmenu.py +++ b/mainmenu.py @@ -389,7 +389,9 @@ class lobby(QtGui.QWidget): continue del network[0] del network[len(network)-1] - musiclist = [ music for music in network ] + + musiclist = [music for music in network] + self.connectprogress.setText('Finishing...') self.tcp.send('RD#%') print '[client]', 'received songs (%d)' % len(musiclist)