diff --git a/gameview.py b/gameview.py index 70a6c31..d98c937 100644 --- a/gameview.py +++ b/gameview.py @@ -2854,7 +2854,6 @@ class gui(QtGui.QWidget): sfx_name = self.m_chatmessage[SFX] if sfx_name == "1" or sfx_name == "0": return - print self.m_chatmessage[SFX] self.playSound(sfx_name) @@ -3585,12 +3584,17 @@ class TCP_Thread(QtCore.QThread): self.parent.areas[type] = [network[i] for i in range(1, len(network))] for i in range(self.parent.areas_len): try: - if self.parent.areas[1][i] == "CASING": - self.parent.areaitems.item(i).setText("%s\n%s | %s\n%s users | %s" % (self.parent.areas[4][i], self.parent.areas[1][i].title(), self.parent.areas[2][i], self.parent.areas[0][i], self.parent.areas[3][i])) + area_players = self.parent.areas[0][i] + area_status = self.parent.areas[1][i].title() + area_cm = self.parent.areas[2][i].decode('utf-8') + area_locked = self.parent.areas[3][i].title() + area_name = self.parent.areas[4][i].decode('utf-8') + if area_status == "Casing": + self.parent.areaitems.item(i).setText("%s\n%s | %s\n%s users | %s" % (area_name, area_status, area_cm, area_players, area_locked)) else: - self.parent.areaitems.item(i).setText("%s\n%s\n%s users | %s" % (self.parent.areas[4][i], self.parent.areas[1][i].title(), self.parent.areas[0][i], self.parent.areas[3][i].title())) + self.parent.areaitems.item(i).setText("%s\n%s\n%s users | %s" % (area_name, area_status, area_players, area_locked)) - if self.parent.areas[3][i] == "LOCKED": + if area_locked == "Locked": self.parent.areaitems.item(i).setIcon(QtGui.QIcon(AO2XPpath + "icons/" + "lock.png")) else: self.parent.areaitems.item(i).setIcon(QtGui.QIcon(AO2XPpath + "icons/" + "house.png"))