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

Compare commits

base: cidoku:8f5605bccb99b958d280af5d00e06256e13d62ef
Branches Tags
cidoku:master
..
compare: cidoku:d821440a4990b2af98047989b2431a8ed128cdcd
Branches Tags
cidoku:master

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

1 changed files with 2 additions and 3 deletions
Show Stats Expand all files Collapse all files

5
gameview.py
View File

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