diff --git a/gameview.py b/gameview.py index 53305d6..5de0703 100644 --- a/gameview.py +++ b/gameview.py @@ -3242,10 +3242,7 @@ class GUI(QtGui.QWidget): # TODO: play only first frame of preanim, figure out zooms scaling = getScaling(ini.read_ini(BASE_PATH + 'characters/' + self.mChatMessage[CHARNAME].lower() + '/char.ini', "options", "scaling").lower()) - if self.mChatMessage[FLIP] == "1": - self.slideSpeaker.setFlipped(True) - else: - self.slideSpeaker.setFlipped(False) + self.slideSpeaker.setFlipped(self.mChatMessage[FLIP] == "1") self.slideSpeaker.playIdle(self.mChatMessage[CHARNAME], self.mChatMessage[ANIM], scaling) self.slideSpeaker.show() @@ -3653,10 +3650,7 @@ class GUI(QtGui.QWidget): self.text.setAlignment(QtCore.Qt.AlignLeft) if not self.animIsEmpty: - if self.mChatMessage[FLIP] == "1": - self.char.setFlipped(True) - else: - self.char.setFlipped(False) + self.char.setFlipped(self.mChatMessage[FLIP] == "1") side = self.mChatMessage[SIDE] emoteMod = int(self.mChatMessage[EMOTE_MOD]) @@ -3773,12 +3767,12 @@ class GUI(QtGui.QWidget): self.setBench(True, side) self.playPre(False) elif emoteMod == NOPRE or emoteMod == NOPRE_ZOOM: - if self.mChatMessage[NO_INTERRUPT] == "0": + if self.mChatMessage[NO_INTERRUPT] == "1": + self.playPre(True) + else: if self.mChatMessage[SFX] not in ["0", "1"]: self.playSfx() self.handleChatMessage3() - else: - self.playPre(True) def playPre(self, nonInterrupting): fChar = self.mChatMessage[CHARNAME].lower()