Compare commits

..

No commits in common. "8f5605bccb99b958d280af5d00e06256e13d62ef" and "d821440a4990b2af98047989b2431a8ed128cdcd" have entirely different histories.

View File

@ -353,7 +353,6 @@ 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"
@ -2426,7 +2425,7 @@ class gui(QtGui.QWidget):
return SCALING_AUTO
def play_preanim(self, noninterrupting):
f_char = self.m_chatmessage[CHARNAME].lower()
f_char = self.m_chatmessage[CHARNAME]
f_preanim = self.m_chatmessage[PREANIM]
ao2_duration = ini.read_ini_int(AOpath+"characters/"+f_char+"/char.ini", "time", "%"+f_preanim, -1)