fix effect sounds (this broke custom sound effects)

This commit is contained in:
cidoku 2025-02-15 00:01:08 -03:00
parent e37e07c565
commit f170df0981

View File

@ -2084,14 +2084,14 @@ class gui(QtGui.QWidget):
self.sidechar.move(0, 0) self.sidechar.move(0, 0)
if (emote_mod == 1 or emote_mod == 2 or emote_mod == 6) and self.m_chatmessage[PREANIM] != "-": if (emote_mod == 1 or emote_mod == 2 or emote_mod == 6) and self.m_chatmessage[PREANIM] != "-":
# sfx_delay = int(self.m_chatmessage[SFX_DELAY]) * 60
# if sfx_delay > 0:
# self.sfx_delay_timer.start(sfx_delay)
# else:
# self.play_sfx()
self.play_preanim(False) self.play_preanim(False)
elif emote_mod == 0 or emote_mod == 5 or self.m_chatmessage[PREANIM] == "-": elif emote_mod == 0 or emote_mod == 5 or self.m_chatmessage[PREANIM] == "-":
if self.m_chatmessage[NO_INTERRUPT] == "0" or self.m_chatmessage[PREANIM] == "-": if self.m_chatmessage[NO_INTERRUPT] == "0" or self.m_chatmessage[PREANIM] == "-":
sfx_delay = int(self.m_chatmessage[SFX_DELAY]) * 60
if sfx_delay > 0:
self.sfx_delay_timer.start(sfx_delay)
else:
self.play_sfx()
self.handle_chatmessage_3() self.handle_chatmessage_3()
else: else:
self.play_preanim(True) self.play_preanim(True)
@ -2493,8 +2493,9 @@ class gui(QtGui.QWidget):
def play_sfx(self): def play_sfx(self):
sfx_name = self.m_chatmessage[SFX] sfx_name = self.m_chatmessage[SFX]
if sfx_name == "1": if sfx_name == "1" or sfx_name == "0":
return return
print self.m_chatmessage[SFX]
self.playSound(sfx_name) self.playSound(sfx_name)