From 79296d911a9d48d908fc1df74c851f20112f9f6a Mon Sep 17 00:00:00 2001 From: cidoku Date: Fri, 20 Jun 2025 22:30:33 -0400 Subject: [PATCH] mystery gif character fix (it was a regression) --- gameview.py | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/gameview.py b/gameview.py index f9cd110..c9c698b 100644 --- a/gameview.py +++ b/gameview.py @@ -433,7 +433,6 @@ class AOCharMovie(QtGui.QLabel): #print "[debug]", p_char, emote_prefix, p_emote, "(!) path is null!" if img_path == "" else img_path if not self.use_pillow: - self.m_movie.stop() self.m_movie.setFileName(img_path) self.m_movie.start() elif self.use_pillow == 1: # apng @@ -508,11 +507,11 @@ class AOCharMovie(QtGui.QLabel): def play_talking(self, p_char, p_emote, scaling = SCALING_AUTO): p_char = p_char.lower() - #gif_path = AOpath + 'characters/' + p_char + '/(b)' + p_emote + '.gif' + gif_path = AOpath + 'characters/' + p_char + '/(b)' + p_emote + '.gif' self.m_movie.stop() self.clear() - #self.m_movie.setFileName(gif_path) + self.m_movie.setFileName(gif_path) self.m_movie.jumpToFrame(0) self.play_once = False @@ -522,11 +521,11 @@ class AOCharMovie(QtGui.QLabel): def play_idle(self, p_char, p_emote, scaling = SCALING_AUTO): p_char = p_char.lower() - #gif_path = AOpath + 'characters/' + p_char + '/(a)' + p_emote + '.gif' + gif_path = AOpath + 'characters/' + p_char + '/(a)' + p_emote + '.gif' self.m_movie.stop() self.clear() - #self.m_movie.setFileName(gif_path) + self.m_movie.setFileName(gif_path) self.m_movie.jumpToFrame(0) self.play_once = False @@ -2986,7 +2985,6 @@ class GUI(QtGui.QWidget): def handle_chatmessage_2(self): self.zoom.set_zoom(False) - self.char.stop() self.effectview.stop() self.text_state = 0 @@ -3109,7 +3107,7 @@ class GUI(QtGui.QWidget): else: self.sidechar.hide() self.sidechar.move(0, 0) - + self.scaling[0] = get_scaling(ini.read_ini(AOpath + 'characters/' + self.m_chatmessage[CHARNAME] + '/char.ini', "options", "scaling").lower()) if self.slide_enabled and self.slide_available: @@ -4025,18 +4023,21 @@ class GUI(QtGui.QWidget): self.changechar.setText('Switch &character') def update_area_list(self): - for i in range(self.areas_len): - area_players = self.areas[0][i] - area_status = self.areas[1][i].title() - area_cm = self.areas[2][i].decode('utf-8') - area_locked = self.areas[3][i].title() - area_name = self.areas[4][i].decode('utf-8') - if area_status == "Casing": - self.areaitems.item(i).setText("%s\n%s | %s\n%s users | %s" % (area_name, area_status, area_cm, area_players, area_locked)) - else: - self.areaitems.item(i).setText("%s\n%s\n%s users | %s" % (area_name, area_status, area_players, area_locked)) - - if area_locked == "Locked": - self.areaitems.item(i).setIcon(QtGui.QIcon(AO2XPpath + "icons/" + "lock.png")) - else: - self.areaitems.item(i).setIcon(QtGui.QIcon(AO2XPpath + "icons/" + "house.png")) \ No newline at end of file + try: + for i in range(self.areas_len): + area_players = self.areas[0][i] + area_status = self.areas[1][i].title() + area_cm = self.areas[2][i].decode('utf-8') + area_locked = self.areas[3][i].title() + area_name = self.areas[4][i].decode('utf-8') + if area_status == "Casing": + self.areaitems.item(i).setText("%s\n%s | %s\n%s users | %s" % (area_name, area_status, area_cm, area_players, area_locked)) + else: + self.areaitems.item(i).setText("%s\n%s\n%s users | %s" % (area_name, area_status, area_players, area_locked)) + + if area_locked == "Locked": + self.areaitems.item(i).setIcon(QtGui.QIcon(AO2XPpath + "icons/" + "lock.png")) + else: + self.areaitems.item(i).setIcon(QtGui.QIcon(AO2XPpath + "icons/" + "house.png")) + except: + print "[debug] Couldn't update areas" \ No newline at end of file