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

what did i change again?...

Browse Source
This commit is contained in:
Headshot 2019-05-08 17:05:25 -04:30
parent bb0c278c2a
commit 20b163b914
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gameview.py
View File

@ -1937,8 +1937,10 @@ class gui(QtGui.QWidget):
else:
self.objectsnd = None
if ini.read_ini_bool(AOpath+"AO2XP.ini", "General", "download sounds"):
self.objectsnd = BASS_StreamCreateURL("http://s3.wasabisys.com/webao/base/characters/"+charname.lower()+"/"+objecting.lower()+".wav", 0, 0, DOWNLOADPROC(), 0)
if not self.objectsnd:
if not exists(AOpath+"characters\\"+charname.lower()): # gotta make sure the character folder exists, better safe than sorry
os.mkdir(AOpath+"characters\\"+charname.lower())
thread.start_new_thread(download_thread, ("http://s3.wasabisys.com/webao/base/characters/"+charname.lower()+"/"+objecting.lower()+".wav", AOpath+"characters/"+charname.lower()+"/"+objecting.lower()+".wav"))
self.objectsnd = BASS_StreamCreateFile(False, AOpath + 'sounds\\general\\sfx-objection.wav', 0, 0, 0)
BASS_ChannelSetAttribute(self.objectsnd, BASS_ATTRIB_VOL, self.soundslider.value() / 100.0)
BASS_ChannelPlay(self.objectsnd, True)
@ -2397,7 +2399,7 @@ class TCP_Thread(QtCore.QThread):
name = 'char id %d' % charid
if len(network) > 3:
name += " ("+network[3]+")"
name += " ("+network[3].decode("utf-8")+")"
self.parent.icLog.append('[%d:%.2d] %s changed the music to %s' % (t[3], t[4], name, music))
else:
self.parent.icLog.append('[%d:%.2d] the music was changed to %s' % (t[3], t[4], music))

2
mainmenu.py
View File

@ -348,7 +348,7 @@ class lobby(QtGui.QWidget):
got_stuff = True
elif header == "decryptor":
self.tcp.send("HI#thanks for the back massage Maya. [IC] Adrian (MayaDA): hey ace#%")
self.tcp.send("HI#vidya is a fucking shitshow#%")
elif header == "ID":
self.tcp.send("ID#AO2#69.1337.420#%") #need to send this to tsuserver3 servers in order to get feature list (FL)