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

mainmenu.py gotChars check

Browse Source
This commit is contained in:
Mauricio 2020-08-01 23:50:05 -04:00
parent a23956ee34
commit 334664e197
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gameview.py
View File

@ -1023,6 +1023,7 @@ class gui(QtGui.QWidget):
self.emotedropdown.addItem(emotelist[1] + ' ' + emotelist[2]) self.emotedropdown.addItem(emotelist[1] + ' ' + emotelist[2])
self.emotedropdown.setCurrentIndex(0) self.emotedropdown.setCurrentIndex(0)
print "set emote page"
self.set_emote_page() self.set_emote_page()
def set_emote_page(self): def set_emote_page(self):

5
mainmenu.py
View File

@ -305,10 +305,10 @@ class lobby(QtGui.QWidget):
def get_sv_players(self, item, *args, **kwargs): def get_sv_players(self, item, *args, **kwargs):
tempdata = "" tempdata = ""
gotChars = False
hplist = [] hplist = []
areas = [[], [], [], []] areas = [[], [], [], []]
features = [] features = []
charlist = None
pingtimer = 150 pingtimer = 150
readytick = -1 readytick = -1
text = item.text() text = item.text()
@ -413,6 +413,7 @@ class lobby(QtGui.QWidget):
continue continue
del network[0] del network[0]
del network[len(network)-1] del network[len(network)-1]
gotChars = True
charlist = [ [char.split('&')[0], -1, "male"] for char in network ] charlist = [ [char.split('&')[0], -1, "male"] for char in network ]
self.connectprogress.setText('Requesting music list (%d)...' % maxmusic) self.connectprogress.setText('Requesting music list (%d)...' % maxmusic)
self.tcp.send('RM#%') self.tcp.send('RM#%')
@ -431,7 +432,7 @@ class lobby(QtGui.QWidget):
print '[client]', 'received songs (%d)' % len(musiclist) print '[client]', 'received songs (%d)' % len(musiclist)
elif header == 'CharsCheck': elif header == 'CharsCheck':
if not self.connecting or not charlist: if not self.connecting or not gotChars:
continue continue
network.pop(0) network.pop(0)
network.pop(len(network)-1) network.pop(len(network)-1)