From 7e8374447a31f96877450574af42d25887122964 Mon Sep 17 00:00:00 2001 From: oy Date: Sun, 10 Jun 2012 13:30:25 +0200 Subject: [PATCH] switched filenames of highlight and client chat message to prevent some misunderstanding there. #966 --- data/audio/sfx_msg-client.wv | Bin 4154 -> 1648 bytes data/audio/sfx_msg-highlight.wv | Bin 1648 -> 4154 bytes src/game/client/components/chat.cpp | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/audio/sfx_msg-client.wv b/data/audio/sfx_msg-client.wv index 516db88e9014f0df98eec9953afb550d8bf8f389..6b68b312e13e9df4536c1eb91200f7cc70d89161 100644 GIT binary patch literal 1648 zcmV-$29No7c5rKG1^@sD1ONaA1^@s6000061^@sB7(4|vZbw5Q7E(z@MlcKj09Qd) zMP_YuAP@im009620D!vy004IZ00ICI0AyiwVGIla073&-S4UPz07CT zztR{{Z^lL|YOmJgpe0@l;|#A2uGq^ippe{qHC4C}`e7?C-w1IE~G)lc$m0 zGP}t(2vzLvZx4&48y({eV$pD6I<84E)8|89;~moCtJF#rK7hz(G1G?6IFCR-9EpLR zZ7soHtx3lbDqLA+l7mnd1{JY+n;dlDnbO_(fl5=evAMmGXTi0*=D0@Jtp@bDel8Q6 za$`>Wv-BD+W1tqFT}hf`C-#+$1WIJ|E?3g?^a?p;=OE}roJUc867|7B9#Ek$3mWUx zQnGehtg_a@Z;^Zy9qra%mN_F3(b{v+M)8%?7jen z9wt(h<#j`-ujC@Tq?h|`n2>m@o_a*YHjCN8+5lHU8!oA z(nu;2HfatNX`~MHQFaRlQ z+JKyF2=$`(N*3sl_>?g&ZJ7Vr#aD%R#Y|DaTEKJ{qYCUZO?)lH z4gy_Snlf+Cq1=jmqyr5=Y{3x%UdrPXHiuDujom3l8%v$wU(}S27m- zFfA!cQ+%ivkc_l2sRgDZ;FSUh3kh#QVNBU(C}?KlCeDrJnjjBlMDAnQ51{U;ZJ}5y z$O(a}vY6;5Q{6&epUpuG6d)cn9s%InNQd=|iL%{#4EPPI=lpOQFwbHC(z3+G4bjIBtbmfPF&t#kto z(j+W`pozo=l?~?>JQekZ5io?1E>JlrMphFES}`){!o@NSo0=TBW}t&(BgEnJ>HsMc z5;7aH*cujT06{im40sjB44e$W~ literal 4154 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 diff --git a/src/game/client/components/chat.cpp b/src/game/client/components/chat.cpp index f3370f94e..5b2831df4 100644 --- a/src/game/client/components/chat.cpp +++ b/src/game/client/components/chat.cpp @@ -357,7 +357,7 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine) { if(Now-m_aLastSoundPlayed[CHAT_HIGHLIGHT] >= time_freq()*3/10) { - m_pClient->m_pSounds->Play(CSounds::CHN_GUI, SOUND_CHAT_CLIENT, 0); + m_pClient->m_pSounds->Play(CSounds::CHN_GUI, SOUND_CHAT_HIGHLIGHT, 0); m_aLastSoundPlayed[CHAT_HIGHLIGHT] = Now; } } @@ -365,7 +365,7 @@ void CChat::AddLine(int ClientID, int Team, const char *pLine) { if(Now-m_aLastSoundPlayed[CHAT_CLIENT] >= time_freq()*3/10) { - m_pClient->m_pSounds->Play(CSounds::CHN_GUI, SOUND_CHAT_HIGHLIGHT, 0); + m_pClient->m_pSounds->Play(CSounds::CHN_GUI, SOUND_CHAT_CLIENT, 0); m_aLastSoundPlayed[CHAT_CLIENT] = Now; } }