diff --git a/gameview.py b/gameview.py index d07d7de..e5a6d8f 100644 --- a/gameview.py +++ b/gameview.py @@ -353,6 +353,7 @@ class AOCharMovie(QtGui.QLabel): def play_pre(self, p_char, p_emote, duration, scaling = SCALING_AUTO): p_char = p_char.lower() + gif_path = AOpath+"characters/"+p_char+"/"+p_emote+".gif" apng_path = AOpath+"characters/"+p_char+"/"+p_emote+".apng" webp_path = AOpath+"characters/"+p_char+"/"+p_emote+".webp" @@ -457,7 +458,7 @@ class AOCharMovie(QtGui.QLabel): def pillow_frame_change(self): if not self.pillow_frames: return - if len(self.pillow_frames)-1 == self.pillow_frame: + if len(self.pillow_frames) - 1 == self.pillow_frame: if self.play_once: self.preanim_timer.start(int(self.pillow_frames[self.pillow_frame][1] * self.pillow_speed)) elif len(self.pillow_frames) > 1: @@ -2425,7 +2426,7 @@ class gui(QtGui.QWidget): return SCALING_AUTO def play_preanim(self, noninterrupting): - f_char = self.m_chatmessage[CHARNAME] + f_char = self.m_chatmessage[CHARNAME].lower() f_preanim = self.m_chatmessage[PREANIM] ao2_duration = ini.read_ini_int(AOpath+"characters/"+f_char+"/char.ini", "time", "%"+f_preanim, -1)