From f210658025c01f4b8f2495960915097e3ccf3c9a Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Wed, 1 Sep 2021 19:16:24 +0100 Subject: [PATCH] Re-arrange channels. PLAYER channel sounds will now trigger even on a channel thats in use (stops sound glitching too badly if doors etc are nearby) --- !TheEsc/!RunImage,ff8 | Bin 26720 -> 26732 bytes !TheEsc/c/Mission2 | 5 ++++- !TheEsc/h/Sound | 2 +- !TheEsc/m2_evact,ffd | Bin 1224 -> 1224 bytes 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8 index 11d34d5a7c53fa343741133bda38cf475684caff..05fcaea0bc873edd576a34a352e120266e9dc222 100644 GIT binary patch delta 2975 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 RQPrAh45g9k)h{j%`ycBKMI`_L delta 3000 zcmYjT4Nz3q6~1TL2m649U3ZsdS>Z`my5Lh6gt#JFmMGu~3W)Nn0^`qU8;$>?6B!qU z7@M&|55_nx$=cSbPPEpnHldm}jM7RQTkS~ICaLUhUKJjUfAKFSZqJjoBc=l@ZIB+-qjCp0V4;4%6SDw8JmxcO^1;A?uV{Xs%(Wq#dXS zI~Xw+1b%WNJM#(qKzak40F(b@Vlrcy!S6z$XrTEK&DWS9m9us!AN4B1v|M7Wa@_{D zisqs>)^1|-ypDw`2i(NXDm#3HT`GZ>$p`W$XvSWZ%`^~3vGjj6dn>@&y?zeAS6TTh zVF|<32q)~q+6X(p&CG_3WPJwiiMR@{W0Trunnrq&<7kbpHi^?cUu!TM52^(av0H70 z@z}2xOkA2y<%PrwsV7Wf(VMLD4sL1Tk*Ow(k; zEUeWCkoR0;pT+`pcvRzrRP<{cU?Q#qa^G_$1y23ouz{PA)Yv z*+5z6luWT!NllrGB)o2wb+8aCbY{rM)w*JS5`8_I;ci_vc{8H3DKXLuFdwt@_1r@P z8*0Q3y$D12soo4^O3@FPlEp>a1<;66n3~|A zBB@9aDOt@4m2em@Cs^Tq9HI9C&e12iS}=$G!<4VE0&YW~ZLX zD&6=1V|yhP8%J}?z*XWg$_h`tqFAA6Cn{N*t~4cD;n2REs*CfO^K2jZBF zG>ohzpl0W#FNs$C;9|YOL)c|^Qg!v)MSW`=J41d1KVL6MpOVfx)TbMgKYmGj`*XTi zDo}gidR5q$Zlx4S>2|J}_?f8BuxdAlHI`FVPRHDgY*>LE z8D?!F`Q##t7Md3m=bgCRu%=SK&$KvU!cXB}*gc^E{)iUw9MNBi4)`l-C(5u7pG>>~ zalY%5@>JkOQ)V`7KzHUNeRC}JJ6ffZ0gmkCU`19vq~r0dFDPw$rr6<{@8pyy6;%1U zb7BAt*!yawMHR#3y*f`|>SS-wMcrE2J=4Ak4V7ZnR1rpS3BA?0XQ~aZc@Ds^Div^;(%ac(~h$sXK1Z3h(NgK76E;)A)OD#T;L z^jF|p%$@GkjwdxGEfM7GAU03m2<^VR(;c9c^o(rn+dPx6xkv4``I=@tji7e0#Feex zrlHi%9~Erzb-8YU(zjkKGhL2iXFhjP5$igo#~M=5c_az_ubtzSno?>@?K?ip0NRYG z(Ux$k1*q{~oSny+iE{b;WpMni5n#goE8s=nhV@NdzQ{8r$f^N4>^^C){ z?g_N@4!RrQ3w+`h>1a)xYlC~}o|~_I$}#ypB?Od=$GCrP9zRH&s(T^%CSIRgNrf<} z#0ekbijwTOk4duCH5$iL9KP>L@SQC&0v$1zOYJ*Wk#xDPH4x3(0@35V!R3T65H^N! zBjFOEHINdnrk&j{mk!Y2q9g>fn2DfE5$D4r0ULkvGD z)P)sh6JAdWs-%{{d1_Tu<9@}lAL5~ThMBn}eMs88wdMaV<`8d&vIOG2aMMA&pM>?*$x<9r!r= zf?;f`%Hwk)m`r!2p-wzpRR({-2UWYNbegLL?IgyAlwv+hHGTz;R$Ipn(~aa6;-+n6 zOhtDqPS?+A*lA9>9f}#tSTx?LPPgm}g=7*)TT=ze13L$l4WrSWmKbK$*enw#3zACL zGN1%p7u6#{<6D7m-z}V1@1!=_R&RqEjJRZgr vo^oz0ycdsx8-4Sdd=V+>HyAtrAI2`wP#(o>EDaqEV*s00Zt%6Q_)_&hrch6~ diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2 index d4c2c21..0e7c628 100644 --- a/!TheEsc/c/Mission2 +++ b/!TheEsc/c/Mission2 @@ -662,7 +662,10 @@ void game2_triggerevent(int id) else if(EventActions[i].Action == 1) // Change area name sprintf(areaname,"%s",Areas[EventActions[i].ActionValue].name); else if(EventActions[i].Action == 2) // Play sound - sound_pcm_playsample_ifidle(EventActions[i].ActionTarget,EventActions[i].ActionValue); + if(EventActions[i].ActionTarget == PCMCHANNEL_PLAYER) + sound_pcm_playsample(EventActions[i].ActionTarget,EventActions[i].ActionValue); + else + sound_pcm_playsample_ifidle(EventActions[i].ActionTarget,EventActions[i].ActionValue); else if(EventActions[i].Action == 3) // Re-arm Events[EventActions[i].ActionTarget].Triggered = 0; else if(EventActions[i].Action == 4) // Schedule Event diff --git a/!TheEsc/h/Sound b/!TheEsc/h/Sound index e30df6e..0e639d5 100644 --- a/!TheEsc/h/Sound +++ b/!TheEsc/h/Sound @@ -39,8 +39,8 @@ // Formatting is important as compile.php parses this enum pcmchannel_e{ - PCMCHANNEL_UI = 5, /*channelid*/ PCMCHANNEL_PLAYER = 5, /*channelid*/ + PCMCHANNEL_UI = 6, /*channelid*/ PCMCHANNEL_NPC1 = 6, /*channelid*/ PCMCHANNEL_NPC2 = 7, /*channelid*/ PCMCHANNEL_AMBIENT = 8, /*channelid*/ diff --git a/!TheEsc/m2_evact,ffd b/!TheEsc/m2_evact,ffd index 95d1c7cbb8d6a26a02515865b9f399d8aaec021f..747fd266fc10f0c8050dd9cc02f516ed602d18d2 100644 GIT binary patch delta 12 TcmX@Xd4hAo9!9o}d%0NvAk74G delta 12 TcmX@Xd4hAo9!A!Ud%0NvAjkxA