From 6e56de08c53c41f6211b9014ae4e9ea66a935394 Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Sat, 22 Feb 2025 22:18:41 -0500 Subject: [PATCH] Quick little fix to add a blank sound for placeholders. --- assets/blank.ogg | Bin 0 -> 25534 bytes assets/config.json | 3 ++- gui_fsm.cpp | 3 +-- sound.cpp | 25 +++++++++++++++++-------- 4 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 assets/blank.ogg diff --git a/assets/blank.ogg b/assets/blank.ogg new file mode 100644 index 0000000000000000000000000000000000000000..3322d4bd274b7c566303381377236a0fa113c491 GIT binary patch literal 25534 zcmeFZcT|&07d|>~5<-9^hAJg!0*HWsl!z3?5Q>PRfCi~bml7aUyN2Eo6cGV6AR=9Q zvw;+`Aw>}c6cq&#d#~qC0QG#wbJo3U{qA3P-58U}TQZqFd-i_zv-hxJ+qR7W1?C<- zW9!m*&HVWiuaN~vcwn%bPYCY-igT9t1^}lHnR#zSHt_EJ_2AvfJF~oz!RyQu3(Ql;%?~QrA6zu^e3DS2daZiqsWo%E zIRIAHc+(&;{+atc0Kjo|6HnPCp7Ktdh)=~u$CjZ02LKH0hGx8R#p(=`o12(->iviR z_H@kjl$yC6%8=CO<5i4}*FZ~QXXXL^432Q3Mmy)HkU5eT#C(Brz5BV3xc09K=a3^dj zmhViMlMGOlmJn_?#HCav|<=;Ne@fOJ$YW2$%3yC6d!x9D(?jm6?w zfujH&M~xA)G5`7E7Eg_p48E#-nj2}MQe2dutaVMb=K9Qw{&ZOl(EzX6PBLCn-fpwe zf7yVY-wVBo?5J8>2fy+<8w=%A88(75@}of6Gq6$~Y1X`Nc8ga&of|BuQZy@03U6uv z*zktjD=ho_`I>xFc#*XTe5&F-z{Hhjc$_~YLDe|tLf&kRun0R4mV$_M3?4?faO zRais!?ot7CEN?|7K2%D5q!~_=Da@GmDC|ms~BJZmxLtfAHHJn53#G!;yP zRj>8YX2;kox)KU>bLgzmn416q@K-9uuJw{FMHbz*QDbgYyKQ57dn5Dz?qS(avlNAb z6#&pErja(PsdZ)xBq_M{`Id6s@ix<^s?1fk)iqqzjFGI{A|01uP1;?o;GSr7U9F%; zS+RUz6C*~fAj@4v+=gfaCocw&vXL=1nO?05pEHsHAdN=oSuwAYHgE2;f+bpY1DbXd zJ@@(lL5J9^&y#Z3g8KE>0fIIUU8E~O(dCSDYj@^ z#><%q7Yh8o>+daSnI+lKfotU9fBh!iL{9{89_eO6OpyA>P67bC%teU+xY%baK|}w4 z_W0ipML;|Xu$5qkm#b9AV2=t{szD}S&k9Z<0!ITcR^t7-N~4W#K^$oKQNS7iY)6%< zrKst_0-x-~i3)4_S8NdT$)4DG+~?BU6}(~RduNkOt!b87g+3)J8kS6Ph*!pVVvj0p ze+Xh?%P@d}0^~$D`|Kw>k1tLvEY6<&7Smpua_E<92Jkx3aCQD|RGbORmC%dGiq(aDKgBbiy=R08$ z6AAe~B_*ZJ>Lg3v*M<V|l-@f8Qha$V*!!UdJE-6(cMOiPi6E$d?X6M zrWt9U?0SNcH<}T*4Fd3~?mTfrNo6X`%$8Diq2ij^2`IVpQ=W(6H1b4WqH;$Z;sQ%1 z)45u8MwU~}8a%N6MLd5=myAk-kld5R5Tr(D*x=x*_?!BR0CTAF$yEb9Ks7+$247%{bA9IH z?-v{1+20@kAGOpVIGaIee|zBrUzob!)2hKr{Yz_l?OfoDA{?mhEt01sL+}jcQ=4#b z20}MEBvmouH767bZaJ_zLb{EVsD}sKRF8)c8Oq8Xw(i!-(Ka>~YV~$W7I`NR+E|p| zwoBG5E*Nk~D(`elUZY%l%OOcqLY`$=TsP=jS|#c3r=nIX>7Lwy+v>qmE4=GV=)}o8 zs;b>~@YCp&9Cb`ORiB-tY53``jjHB=69C(z(7+@zMY~Mln0P97zI3$+fO4adpprnH zfm%^uldK1|g2=$-ZGy*UTGWhWp7zYdKQU>Zqu8dK@VEh8J`WnDI9>o%pxkD1;=1! zBW(JGnfn1R!sZWc=1c!w~tCAlf)gymaqLjzqD@bm3KU3FB$T4b2NbBp!?({+6}bX4G@~bKM5L`O?CpJCA<85CayUmCQPO zF@;>8@@zpxI|b9?*$Qwnmo!D$bgWJf2df0C5iKw~KDXcFn`y=$zQ*g0AqRb+YoKm7}LQls%RiWznJeYJGyw9>2Mi^MTvWN20r+7lh_<=vbtS zm`p{>Xh{A0sLT`Xnc_wy8;H)wLtd9nmN2Z-4D&|Cx^MS?tX%XQSfaAIQlls4efU^< z*3mV@xphgdicN+5=<{b^MmDLxMY{6%Rs;G_CE}8WP=HJqfg|Jc5}$_ryN(pO*)oMm zkz$bml$YjSUcTBMe`CBtMxPptACW4~eDS=0D|7sUqp0_jCx zL=IbO9J4fUmWlwAuFtE5h?J8(oaYoY2hDVmhch;^M{VR2Pxq_*nm#);zMj$j&Z}-r zQ#o-+jP#tor-Xe#F`#i!ZLXN5diy_HKe&}N|5UiZdD;D~AKvex_ButH$5q6}KNHNq zw8gnw@10D1sX;%_QRnNi8asxmoXgflY7 zKq_psD{qyQ2ikgL=(BV8IJM>9EKe)Gk#8o|ok3-n8tX%V=6xPVyB>Pcm8m+*4r<4jRWn zT0m=F4~pwDBgCcCGs?&l;+8>ZK%g?JJSi!WQ-Ct8EIjte&LA`FQ&C`l{G)FMPDckl z&Rp4$Y@$>fW^d!uD81scYLsW#2P<$$^Jtl3Wh-LECtXPeN@;n;*iYUV zenFx)_)$0Vtq9K8jOI6ewr+wm7LzS!+g+l9p%g$H@|9ayZWqaox}B$|+2LFs=N+nK zsej_mg;kf3(A$K0Ph|E2+=@dQ{T#5Gj5jRoqMfmcn3k ztOw7=VsJC+81UO<%{GhNlA$OmB5-iiG_A#>JpA&HD{mMYR>D_dfW|@|Bqy-_O(h2b>B5pOpkDXDCf3d?M znWbqc9JIq2;5|Ch>KifY-PG%_dBi{D#c1igfl#W}b!%a2B5N~8Bp}Z8N@?Jxcf!r4 z8=rmN+b9%OvTacyX+sDbDhSfSLCJ6^#8$wao3a@-bh{J$_I#!MoEj=@W>UGZC*0og z-RxufDQ-7cI(^*v6>s$TlWKSBwVct{o>%W*^Ox@f`^P-<$PUrVT`&7O0&Z7Ce7CbAiCS+_y_F@7%k96pp3SS_pzY zs{ztN1IUGBd1LJCg#EU`0W-~_;HnZiVGK0+UE7+k9dV9+?$8)w*gmDF@=hKtV_E0W z4l7Luqm4j@Yh%mnb9*q`mx_x4njn zuEo-^=t(TURPeA8Ze~b-S}0r9P8Ay-d;=%_-h9H*Z+d8NKPfW#Vek1ptTC+-)rJa3 zso@tEB?TJ}83eCR(=l0cyhrqHUJKs(vliV?H%b;zM1c<=Ab6mD&=t+O(u09>#e<5! zm+@>fz9Z`z6GK&qjD{5UIy2dwSk+1WFZs1S%LppZl2T>VtmC~Fkl0)5AH{9l|Dv|q zs`Kv9)#e1h*JCfjoC6FVHXPzweNT1J!KtJnR%}i+f>x4j`LtfP@|O(%VVz(sR3S*^ zm@se%2o`cS+aGo68f67&33tM6{qoW1T}oWzhtP!{%WYd1#;-bJv!`BY_hj_N1%Z>x zH;?qxtFj0!w)EuPKpJ+1BG&i-sE2r^8LdCpJ`1>cTAwhpz%t!4O9hR1!7iXb>pE&J zGQH1xj3IAytLDaS&kZVnxiC_X)-OQp(@)@fwTgz%_rI=pZ>cj+Psu*h@1VZjd;NMb z+`%MVq#vN6Sc8&4hbY}5YlYF`@bJL)rPFiP{>}ZL)?PAX(PI_BNaF$1!2I#5TAy!s z*0inRvXZC+vE<>pk?*QEBr7UpGcG#?ZmieQn@W_azH=L~il}^=ywq!GgK6nX zZo`VP;S2I<-R*wMpBpaFu)qa42ln_2%Jd<~LqumRf~B>Zek?AJ>On`mLB)f)75#@B zv#V0wtPp7e1fZ!hoPU!Wu$*#X=(FG3`!4$i96eq|ptSuzEM54Qep7$%0f|uIZxS0V zLmp7Ox<9W=3V4J{!LL8&-iDnb;RTg|K|^wvBGBdFe=f5BRgiqA%$kx!5=j7tlLO3< z1%IJ%uQBMRQw`=c5ur}g*vEn*$f>WR5l<7p?|RYW^rQN~=3%d)_wyg$(WWfcU2^M= zT7S#xF17%{co^u(;AJ#`lm-Pz(}O_^RLR*T@V_W7{;+#0GsYwhDkOdK(Xu!+GW6!C zUrkidG1XAJI_n9P=bqD9!pA!6OqKVqqgj4g_H3(Pbdrv|*#UvckeBPWEF?&wyZzaE z#%Nrt1{%X4vbs=-u5D%l^j{VW4sq7-&v+R*TfNPu&_Bz;@O9FRC|ep)Ihw9idgaFS zt=GAmhIii!T3NMBabI`f=%I9L?`xMrZ<}1Zyav}%c-re(M3n0irKV-LMDIaAfawxM ziCJ}Z0?Gff`?lR~OmhTd!ZTRc;%Oy#zh|w1b^>&9LM-%t!C^{6f>+$#+j>% zB#55!4Z10$7d}nu3PiH(8@xE}963P(u~O5upUp)mx^ya#`mG`{*}ss^eBZ>Zkn3nW zK886ilEMqioB~xaJy!D!<5;>5?Te5zU!N@_P8iX&zaM^gyr+S@WmEp`@Ms%Ts^R?< z3$4(^GPG2}tA(7{R@P|>43%`~Iy8*;P^-iM;lG3^QIi|Ogy=pRj&1r`luw2nPWi%w z1mj)OlIAr5(gHPItK%0buIk*X8r?fS7-ix3VXs#Iu^X%16ka>5?cV0<{_r-Ka%gR% zN=cLW$N-DS5o(NdWM=K;pZL_Sn`xQ`Y~YktFWL3Brnr~?!oKjmw?|*q^@K!;`*3t3b^&8g7?uni9!Jf%`W7*Oy!^LC|gN8JqjevD@b&E2vGQhC7{V9hEALA;cc23ul9Mq93*#6V4dyC4qj5MO^|R;y)l0ba z+&fev#dwQ+a_xiN83n?zLN|AQe4)8w>Dlsr!O((Jtj{JNwBC6HoicT^4&H-YzsMJ& zQLEZi79_Q!d|6MA@Eyaf0YHkz;&vKGjZ#oeR4|M@C3SI-{{nUeZr4jn(o`T)816dS zXC1*fa$U#yW7EX>)8?-HB6&hhA1*&IB8wNsGgZ}In+h)}u?jYsI(|cLX??UbdJoj?XE6MB*6fYgaYIG@99n6M#X2%(hYOYEo18;YYHy5NjO(Kj95BN z*p5A6Nw=FV(VsdrX!dIRJHWi$T6xo+M4{=h=*xNr=>VZazDJNVrz8Ia<#L(s$;=pv zFr5T}vcr+P@js-~)fUEubgl0Yda+bF{N?~|?bU{rT9splqy|#ehVA2ZoOa@L(u-YW z%vVy(kk}BR{Q;Rw_vt|>OQtvkMN%*}o)5r4^j|?<=3)0H6%iCvN!R;lP|iTsrw zk%CztC)GsakDd>BxJqb=*a55ZtGo1+3Kjy&$FFV9=aibWb)yusWW{@9``)}bxIjb$ ziJ?awGeW%RTvx5TT0}lTMI&>Q_dC?)p>rOB&18y0g0_HX$xd21Z;h_3d;L7NX-nsi2)_$g!vsH6nfLbG89(%*HrJYm z&WE^Jb{Fr2mp{Nq9F*$Q=)4TLBKLwMY*W9dMLY~3x6<+jC+i7xAV%g=faFQQt<;qK z4-w^G)q5hCKrv^+h~4at`$fm{e#=8Py5g~(A0?Smug^r+E-azoD7W^*?k+Th8nwldb zytVsXDLy+IeZK9e|GnOCF?W}hb3D>7zI)@*RdSANF_~EuxxQ8V;g|Q%^9Q?n$ce0# zdz6$oQ&@1y2#evMJv6v2v9YLGBe>Br9swRh2BvN1*1C*lK#~(4_b-kKu9;Vmu za^=l3I`re6FKtg1dRf#uE_{XeMW?I|xP))N`(ia8YTq$k{u=@TG$D-;a0(#;G~$7l zp@(C6D#iyQ9svtTfk~`>P=-?8Gp?w zGs@ER&5RC0+=~nGT`jpu#=%tnxFqbTn6xDF$N>$xH>?)8k+waOIyMId{@|%B5}CpU zCD1TL*O|m!4BR*&+m$svQ2zQn-(Pm7R)<5I7rhJDmFnppG~QyP`?}ZLwP`4UA9F+_ zfvqbiJh+I~7Kfn50Gk4&bg+Xm7!H;QCyV$?HD#>J$i zheHLNz5Q1;9!42bGDG|C_@vN2Tj)Mk3pDy*X5ul{7n}6mR^!NOHPG{+T+k3l0})s{ zK*<1Tf&Mjo?u29qor*G;#I}nW+C!c9-TB@EC;PLgjfUb2qmR7OnLC+ih_jB$(*`RPpUk@5u-`yomEWjVVkt4@Ck&t@|Un$ z4^oKtsA!B8nxf>PA=tv^$8+-d9KdRC$nwqT`JZOI(@t+fMI@3E11ZeOM_~&j+HWZj zwhRwC_wy}ltEd-Il)%18YMsBtt=p|vV-NK-)hXU1Px2_{wK!;9MwVjqG`~jbK_t== zfuLO|C)1Fwy@Q(&K9~QB4x*R4HKnt|Lkn`;7yE2`#!6GK zRp!^$NZ-~VAAF*EItG_;@#64Ky&x~#@c8+ICmXS2oMU;*Fd!0zGXj*rS5gOEC!~&{ zd*+7sr@v3tEM-8R4~Cl{ZJw~tEk@xg)D2czBZ~Xu`uPV_6os)>eWK?Z^LGKC(&5zS zPqYU{oZe^T$EvjoRd;-UNz#zvx(1>MEiG7N5NF~IDt&;=>|zf6y_jd3O7oY)u~BeF zFl?uk`AjrsN_7bZdPPZ;jlCF1GzjIIZ#Vbuqi;S{c8TwF-TA8IhC{f?Osmb~_|^43 zsqPfpJvD6Nn*e&Z3!M_x3J6-nF`Q8sM_UFztCWAZe2E&n3Y7vn1_nxdOP^W^UT^aB zG0|n=b_ywA0=`HTF;^98$C&tVqMkKea6BAU>XQ(eyP5fpYjR**c+J#({%`mL}Foh!DeeuI}yJ1kr^9elZV=)cNJsUEoPKQ zS{N5J2Sp@TBL9v=#(UfEBm6DIgPN5?`B-vKJ!-6l9u9OT(M0;Jp8UzI zKjhdk5s_jXAbsijh%py6vxv z+u)QVq19r^AF&f?)(9QHu2G~Y=Pl6p%{BW^?Ksb0wm~LeY>Ow+#Mm7HkUg8gjRH$$;a#RF-*6KU;;aO~F zz>Pi8&2`R-PtI66Wz5e?Z_1NODzghqTBnq(T*_G7fAH0%T)n85{$lM-gWXCVuKG1b z(lUJBM1Z1TjH48Z6dnh{gV-}_ISUMDNf+hJ4yOupNHrqhlKzei^%N!V72+FjHmJXg zq)j>%WXhJz+qHdDH?hd_^hkHox|7#C-!$ybwizF~Va9kR9_zj}|=>{?%myj^jXr41A-A3mu#F-yiw*8vzma`XD5!Bd( z0b7zuAUAs{1)~!t-TO8}n;m(_d8lH|g@QT~M?H z$#dLx_RH$Mhx+#EbXiMNmG&0DlpG63PjDo22oYEcNk8SBwhYb=$ngEgQdsgt(mlpR zB^sJcPP|Y~{J!OKat6VaMoMqM@DVDe)MQtq^UKA7uRE67bZFo9`{KT4mte(wZ?O@7 zb=)&m>)i{r*6{OT@T3-C#YYzO7;N$CCvkGOYk)aW@=rSk%O|Vk#6_qWBNCu&5;B{# zAkozsuWHB-MY~_*N<0?2+HQWZ#Wqc&H7B%na!pR0^{a5B<%{VcKunuO;_NYoeQ`h~ z70acyNDk6%TYjy%|AkojcB&JC32AgH24TeiFo;Y&PLdQ#?|{h{2&YppIH zBYvOAdvK9i-~DE_x^O^oTK$FnAA|0e4@s8iH-9ypev<44*7XW=5f=>?hI~k1%TDl< zc&tR5x2dx zt_Ts7j0aCS(xHJ)_Ij#E@`cH3>0=wwae0{Oxy|W)^t9o1U$>62lzE6HUG6_b23+ zM4O!~R!ew%b;bd&X} zNnW?o>+op@WwRXjoGGHQx?JaDFF6T6D~-t^Jq}hf0y0)nZfHM#BAEs?@!!fNirgeh z1tH%E6&^$j_4ZB?_ui;BUYR5Dx}?e~tm<6iX$6gZ#rm#01hwPyA69>p4Hjp%9k*<- z>zj8kwe$APv#yuYusVIUd1D|B2nXE7kHMqQ0@&v5af=)TlWyl}A0U6wFqiU+8Sr-TR-dmG zDT(UgYe5!b7vWm4(Gt9g`d5FgY0Jcr=r9e_HSzFq#SRfZndK+ih$}}o)$K4SUEm}e zZ~496QCTz~|IGQjt?#V=TDJ0blfpra~aXBSeQvV3`& z!R~LwibH0LpL$JI2Td)1EPQ^dIC*3b(y=}uY1~=58AvT4o2^Ke)j2^xB0^%Vg85pRobIh zCGU1qH~eAtWZ|bzmpZi(MPKJV<=6E6j&Qdw7F^P)H%PIbP*L*GqF_MVT||imw74>n zGz@umbaQM6EQ8{uJ$WTHP2^H@j1gSaoV`(wG5Y!^DN^}GrDffF->Qy1m?yTPVght+8BwkZn8xdJ!svOfV4XlC_yl@5yjhz` z56<8MUUze3yJqGR5fPp(_Sn2)d+x%Wu(DAX-(Th&ppNYmTkrg`;!* z*vWD*JAGwLD@R~>KiX8g=-LC9=X4GevupF#2RTa)sv zefZ$+_XV0~LR#xg)@*TCnm*m37 zkL7ovgGB};9h?j-8@l)JX&LdF5?<(*1`r-oTl~E_!8U_lI*|J0obbt}7y?l;?EF^y zmZ@#+6@eq#`YmWCPj7OVV+-lfr(eTcc9;)K%m*wX#2K zVOcvW@`RZFS1dv%BH&ppwkQvQEI$S>NZ`X;K-fPsCJ4lTrkZA(MQ*UDh8Jc4tCf2e zo3~9G?z=2LQQb=zR-u_M;WE^8&peh6y3XHplj9Utfi=pLBRZ zuUOLGkL4c(3C7?M-_W3$)jIp5f7M9xN}Q6IR8tZUdxF}4fyes~IZa;GXFYU=^|q}~ zEp#mxUfh%^aMkw!&Fu1y5*v;Az86aD8sd$@KPqI)(yUq}LG^sTJzXxbN`>vcgDr|^ z1N0ov`tyh}@!26Tkbg|;X3AD+2C26uM)x$c zN!#@Pvg~X8P60#d92N6UfRf~Z*jNS_q_Zm{u!6s){ii{nBj!tklVPa`fOrOsY~3iV zB>f;Zd}N$dKC$lj#yz7KOc;d1_mfqdybp;N-?@nCh+?jYc_QCfJMTgrl}5SGjWxSQ z@CIwy-NJyb1su80u|NvKT%KwDBZ$5F*e)IB#9&nk&`=rOpST(?ugALUqJF~gVA~+o zOSVm_^ujeUXN83F;dc#L1qSn;oEtWxGDPazw(C+JwkTmZc%orApo3*D0K>;c{#_^J zY*itSF`^4&0QZb^5z4FK#_D^=&dXicj+0$w60=ECUuvb<2dj=L9}8~(jjs0GvLyAX zs|AOy$dH1(9yQFX-Vg;KN$PSIv|!_50uJ#+lV*hnA;nMO@ha?K?Ucl|t4)azGC?2T zl@f6M@s{20I7K}g;qrFirI4Odn%)QDpczLb_cTQF<4T zvHw@)u+vOxa*8nL_1I!)v-(zE$K+z!57~uh>n0ym+gk_8JTPS+cx_TMuX16)$xC8G zmJe)k>)%Z0B9AYLG-`UN4?fgN6G)5T0?5)U38o2i`Dzi)FCzWd3Y#e;ERsxOrsEiL zrZBj(J%3H@hQD*%XGy!=Zu@&5kP{AQ8ojF9dwfx{LP< zbeTql>9~AI=Ukz+`U4b^izrDn;$2)$qGGYSvp)Wh5J;}LIv6I~W~eu>TO?V;=uoHT z(8NO3yKZ40<&UZHTP|L6zP|C~Zu>_EQqP;3IBysnU2th^eKJvKN*YJdu1o%evDgOv(&$C8?OCX2}k?u?iU%k&0S6x z7JS#aWLc?6jQv(X_2SF+@=$p{;IdFh5a*abX2sWz(71ZAxKu$Dv``RS9Vf)23$S3w zFcaJT!@b+;!KIcU7Rf`nf>S0GL&pKVEKa}k&Hi~?HC7)od7tKOSk-ZiKWw3V^WL)J zvoHG(d?`sPGYDK(eX_fITV5Vt0KW?fqlF@LWm$>>XY35yfmBMW@>tx3hb-W%rWC>|@1yk*$A=y4!cw(UcI6XR*LmC|J|rby!MdZQ z(8GuY2T(vPkOmoJY+4ujKNdG+0jd%~B!(1i0yyXA6|SP}D%^PSitZlqt~cYCM=e@w zS3WJ+`joDTdVAqOQgLguUq$1^ z_eW!=ZYxHvHsUP9RlXN>ac2V$4wm4Jp;RKYI6@8{HK+TK1^%fbKa-W+Ze?;Dj5!P# zyq)XLKFgQQL67X;{Dd=5y6LDbAuX<({U|nzRT|*VHzg?ZWn^XIauv+u;j<*YGZ9&g zqU`Os_1mNHQV}r08Uf2cwKV4{f&K(Awh|Bl(s3ftlaaodH+<-&ZmWn_IQ~|NO|FUS zu4rrzxFqb`aNKf9;G;!p4Vw=1QTB&ze4;_gNQhB;85}n-DD`NW#;( zt+6(4PqSpQwdo;9Ia-*g38LgZDb@$xEJ-;F6}4 z1(ofK7#pl5ue?}Sf8&9F(Z&XYtnTm+cVuJYQH`cHKS-YqC%N0U=kQ6LsP@NQ(rZR! zx@c1^SPgm`Kp1EZPy{Sz`}uQVoxx0A0RrT+r;8R0?t%N%$I$jcuY43U0*CXLA3u5T z?2ZEMj*o-spN>~*Wlj2&7u#>}R@c`oy_WjG_6EleGATZbuO&#nLU0HMGkF#! z{${#U<5hCZvaoeOS=eqj)y>fub5po8C`ZunAW8ZLQPD0ECz#4NK1D*~6Ep5!%)fK= ze*fCGSN0Q&3r{J&RY&ve2K2dwJ zO|!Tlv!)u>m;wqf_Ak#du%1}c^LEsGkM$;pSK&6&^lD?Z%*h|OT))4MDdiW=j*GZB z|7u&I>>v}(@awtWUFHZ3Q5IM+et^L0o1Y-@XJ`NmF<~>FY1@<-4KN9i&uF})S!V1) zf1&aD`q$c(Ma0}i-5r|^Y#?|y6JF+V?cw*!E$H8z#j?PM9s`npv(}2RX4cH@0xwbqa}2>>g{(m#O_u;tzS_; zY`&L4AUREc@mdNB{E$w>ZK}qqpL;>T`HIL zz-VSoFq01@%&TxV>`&2EV7xCpx-QOJSaT~SoPAPGZB*vr%dJ7``ZD{dr1?t7IH-dUmdUZ&sMyY8CHUl?w|?<)EY~un2>ZV_DbZx=RQ+ z#mkRxC%Q$__bfZmDOh1fd}ezp{c>#gvKP-e^%Li`qj!lYD1F7tbdmOOEcugxc^e>^ zlX0As*2=H7cp7_FiqpSSDuc6(Yho2lhQU2ZQ2CmAN1x^pc8VHmrXS$nxxK7Sx!6B` z(@xK*!(&0;J)ciaoZ0#~=;58xbdhx71@E~{u6K@}S-Q|FkfcFeFFgjdBsqk%2p2j` zf6isP|6$#WRV6}Tl>iEE8g^LS%~*}*n}^B1!cJW&s5n@#K}FgqK9KP}>s^Jf^3&vo ztrO!@y3^EBkt!XWh4ig81K3paN|k9t&??2%8NOX48P-c#@l{*3hrtAQi{kjyr3LyvvIh2gBz7rkSMlFV|m=? z?hzMNxt%Nh^+A{+Dpgf59nXSAL>!eKF+Lrs!C&6;A9!2hkZNfn{8Jq~pHg|CDYXdg zR(sXztz+~z`a!e26Z-WwHbwcOMxB%P{&}ClrV*>H!hxy#h=&Z4O|=^bx~f)~MUYWM znhQW7BrO^R;96Vosf5{8_6Kyk8r)q{f{To%0Julu;*JfA`UcmD;*Gg-Nowr1`C#1D zpJw53GDRYK@JZV+vd7!!hQUgk&~0j=q)5H7J%9}N+Ywx%5R4UyG$v#Q#7Hf|bK{z^ zhJQ~d7G#B#B~nar(0XvCmYJ-!Skr_0;T2UJL8OZbq++vDw>W*?D?8usY^`MHw`ass z`gTj=hm}qtv`fkQE?s1eCc*eT0T7BrRLTGrU6=y6X^7ZQ<^N@9}2 zj}j`8AjB8tu$Gfd2Y6bMF**idG+_1dFB#4y+jvnrFWF|Vx|s6qei-Yzm&56gLw9lliRiKV49W+EsN*c-1 zxztOFE*z{(JBtEX(t_(FdY~jB0zUWK((jzL^tRoan}zA-1ponFDP?CL$pO7xttb40 z+IlkN_-%`iS`aAY#kLR{Zna$L} z?fc84mbRE(UjHi2^ems3R&SL*y<)J!h++)$z=TSH9+0cU;%BjSA4SX#3wq}n#fPk9 z6NDWwuGiGl&U(mj$q0H?ip<}g~ z1M)Gusac11LG)z6$tUj$j z*>|A{+gp@P8a{fx(|^*3BI#-%O=y`N-HN|W+AQb#B=?#dvtXvIq}(z2W$Kdb_<7!4 zd*WznDviWLZQ#Vx(e-cleHD8Az**|Vw8HmHR*&rCoGQuYPxjR4q{_T>aVgu*9iXy1zOBa^9Jo!4s zxAP-r$=*|EUEei@=Z1;~MNx9e+micx^!-mruhz8H2^M7w5+ZM6DQf}T?h4)8-S%!e zOz!<#z6~<;*B+Oc^MGm3VdFa^6qdjB2sNp>Hh)?rFRn&Dx#oy#Xf`Nb-;<@pV_DfS|g&CZ++=wOmC;IV{4o|-r2rI1PcC|lFFgNpAE3(@>P2`9V z?#7wV(QbKCQEhttuA2!%vdd2}l5sd;v1)6;$7`))yAa)2VC?F`nKfvGL&l|FfEMJzNuP=-39^@MUCnkh8 z3!dQK=bz1@>f8>ebOx>n1`Pv^XO7@Jq?-LWXL_jW>d$&LgmDWKDGv*oQ^Nd}`DQB{ zW5x!B{2YAL@*bq@c;tmPOP9>aJ8}byiMURvB;bHdX}K%ffF6tW_%DEC3;jtnhR$16 z)}v+h(LJ~8u3YbOQ4L;k=D6d@3hObQHxf(Y>@n77P2Vuh>$;Y^eEFPqZL??bkR(x# zZ@}}|`3OUbl6j$#JSi8gg>p59eC{mC5%4=PKih=Wf~9G^%4HF_t^!p2A9{P>be`)x z9J*mH6hf6#u;>ZSYgadVv1_p%x^3eNLlBvVyX83`dfNGj;-|g*m72O3x)qF$`S1YI zAV^~%kb?TQ;y1;=b4Cs1u601ZP1p)1Oh`cyQTj|2ZY&b9b<2+_aJ>6kQ4!T1Nb>Zs z^ympp45_@(Ir1RzU6SI&G5K(ujCttReoBkf;9Lshq+N zvfdMvToT*dvS96|I~DbZ>_UXF)t~!BR`KCf(-pGTYTkO3=yzq&u+(6xdt0Md3zmkv zgca)|Qlb$0&@7<&(<*f2c9h^4fNBb(lAE>h#>gYpE?U$hA^pt$LSwN4u~ddrr2A@h zEw;Tsd)x4s^}p6fpC%{E=ls!#hOVG_Y#6qka~twjauN56Ph*$w+i1ti59y?rY+kr=N#(wZ1MENQjG^(`kg?P=vw?;Q2> z9V{H_RFbeafqsPskjv6NggJ)y4?14X7S_+fUBEnolD^DgVY4nEjF_K(`eIskp(Dny zT;IPuiEFX0^3aa?r_<PZV%p3HhA)m|R7fE3__ZEaeI#Q{BYjFtx`Dgs-> z0{_KO27B7iaQ|>Eb=|miVBGo3?CSdSBb%ykx5EcYZk~$t3~eyTqH% ze2JH>Y@648A=5>9+&C%W;wVATOq;{-LT6!7Eu9G5pDsni{p2U-e8%7Mf`^%KlWgQB zNMp!8lFRUkK7ZJIOTv@1??67V)Shgn@;YdXsr*X5ybmPj>4E3m(QkXH56VmaYJB&^ zZrgUL)@6KJ9`r#FOQ52q0UDszVFv|y_VnMk7%|HdVW~?r+z`2hEZ;2>t$o9DrZ=>}PTn)S@3x?$?_A35;~%e73dgO(?9x?Bn`hnccAKmKhKg$OrW86B zI*bUc3r>(m7weky8IYv;>F#Gs^=3-ug)v4bDy+i#pn1pr9Ts_RaOtcu=9#Q*V3hHL zha#i{hs13}cGbEr8o1frkY&IS5^mV_Vy(eNzVBHnMqMWX`MD5Svwn&maAD^l-|j|CKOfMeJSz&P|MXgUV?md-r@Rfdjn6=}qQZ!wqb{<*H zpdCZt+ooWgf|81B<+P#Jfp9Dyu)4`28e*ClNb1ch%kLy1j4pXhfH(}Ap{c`#&#Soc@R46*J^hL9=Fz)?(Lvh8r#1}7ISgOPn`gYfO> zg_{mMQ`y%y(6;rApLC|2N+E{k?OCuHb1`K)qp& zYfaAA_8;rLRcAkq|28pCHLbA{)x&sjqDAA$2_#GUopMqqsI|?Gopw=!7OEn zO4DdVvG{b+2J}Yf+(+mr1CD?Mc!Didqu+O&esW7nyH5H@KD!fud@>{9nmdMn^7~q1 zZfrBBfoF1DJ2gFIC<7BJ7}lnGuyai9Tg17@gq;o~-VOow2qKW>f`qi6u$ljYL#%#G zIBK-rS;8Te0jl;cm0=g6^1)X@_mkOXvTiAecZJD9xa}*`g8t6(*m%J^>&)N;w08FP zXE8p_wuE>R$0^|F!brbyktN!{SzAXYbrMbm~J{aEtAeH+tdIKPy$m|7wE&(KJEuDJNZ%g08%LGu_~% z{xcqGpUO?771 zBdmeAlx=ZJOmi^K(ENx@eS#{FX(>dA9k~(1w~wPn1|_NoG0AjQHGCEk>MwlQ4INb4 zTmyC&$U@Y9qrs?@Qs{gIO487>G@(>YEqQUxp)FcF!Ts!BY4s{*) z0I+=pSWJ-GNyeMuA*3r#A)|cj)$ev!nxxxmOIHnM51vyPlf7@b>tpI1Syl3J@kT^V$-;w8)6)p zJv(L0IS^?QQ=Iy;$CT}RYx9`$8G>Sd13lGHhj6iX=eSy-%C2FT1Bd*b#*OxFIWfH_ z?X4R95zZo7nu1mbdfZYprVSUicD%npr=O{4-vO|PCL-4xB-|?7BHX{?S)U@tm@c-5 zWIFmZ-ns$y$@3r*Qwigcfl zOF^B7(Lr8sQF?3Pw?>AoYuS{$liXdv60%VCIJJ;Co$KqBTxaxU1#OHTwb!acM1=bzRk4|#CQx$tx8uOo}zyw~_i zMXeObUq*vtdgqBrSdUkwz{g9^Eex89XF>9z01<;S@L4G+J+;-OxIRdWOd^DBh_kk< z1e*qS#vlk&9g@69kxaLxp4U+hPZrbq-=7~EX6(xr4#b@;nM^Eo{r;rxiIpfVJ+}m{ zIliH+zm4fg190;!#)L(}ka-{?X@(+@bXHmCzfPRMSEE8a1?YT%CN`mKf%vrYoV((| zn9z>}Cu{Cdw~fnO9}KuDbz#%f+**^{jr3+C;#Ubb*ujmo_ZV*B%xFzCWWhxd6d-D} zT9A1N3iZGbgP>Mp@JrSF%p1A%0pA)B8{m;eS^3_$K;{n`gd2|jh;6cBbnMmC^z52i z(%H*7IHY{`tzvGlUbQ{<_1tLUdzTD!je@_jUtA@t0~<%Aw4tt-c&8ik0lWR_Zxj%H zx-LK}hgJs7W6qF4m_ABS<2m!9_3(&>A9klybyCF@T&>$n^hB3QRLdQe(ECLG^3$Nwe)i&|7-<#-B0r59tEmYDMD#|yx;=Gwd zCUV9qO5Ii=Pcb!vAi%Tmu-}LWU8rbg3*e-JqJ!`ue92Kzsjv#o51V;lf`1lQ56!<$w-)~74GY;d2GOZliW8arKCeoV5xL+AF9-&&Mt z9=h{|-g)vmjKGj(C46g(o0uz3roAu(VCN5j63{^%3=Md^*WU$vrqne&gi#Wjl+{RE zW{8c<+B}P(gif$KkmMZ%ohZ!xemM=Ndj6c%AO85p4~&9O|GuWa6m1pmS9~K4+73kn zyAB4{3;q)ip+&c}nrYYNZNOhB3-E{x@;0H?a9OuEq{qFEyg)`RZd3UPqLI)NX2-E<~+G*jF0m#)8itkn@W>Wdc| z_$WlD#LdKonQ+{B;90JwW%G^kockp6KNuKo3nz7fkEhE8;?|=zB`F#~CN|%wZ!fxg zY?!iC?_ZvN_?VkPcTj9|ULQ-0Z^sOhgWAntGzEb?V0cY&SOo)=a1}4ag7?Kvy7R7p z<6(ijQ2+Q6CIk_Yyb5)Sh-4x0p9%JcSZoWh+sQWl!^)jZSIli0iXU+9bUnjy-aAq2 zQhB=k$WMX~1>(^cu(XblR4cmJ4CdUNe6K1C)`ir#DX9dC7mik=fa8W5LdC+|y@9r- zs3)z*nZ~Ap+>IE9EqrH2H=|A@R&WBljvw?#YTEWKe*ewYl3X&mD}CGTb7P4axO$y1 z@5$I>MaQ=ycM)2P+ORxIPAe7$ns}by11ga$T(aD-o`V%EH{e=G1E!k7hPLQi*ZmR{ zkN0@3g6{anqG!3iZ|bx64ZK*oJa{!U^s#?`{d}WCPMCAuzp%b4wO6Rt%N0tobl5Z8 zUni|>j)-S5U{EbcGTcKZHsD_!5N_Cae8RNa4Vj P@v7&)6B7lK=!^ajKk3kR literal 0 HcmV?d00001 diff --git a/assets/config.json b/assets/config.json index fa9e72c..b062809 100644 --- a/assets/config.json +++ b/assets/config.json @@ -3,7 +3,8 @@ "sword_1": "assets/sword.1.ogg", "monster_16": "assets/monster-16.ogg", "monster_1": "assets/monster-1.ogg", - "step_leather_1": "assets/step_leather_1.ogg" + "walk": "assets/blank.ogg", + "blank": "assets/blank.ogg" }, "sprites": { "armored_knight": "assets/armored_knight_1-256.png", diff --git a/gui_fsm.cpp b/gui_fsm.cpp index 9c77b9e..e74c866 100644 --- a/gui_fsm.cpp +++ b/gui_fsm.cpp @@ -202,8 +202,7 @@ namespace gui { Point move_to = $main_ui.plan_move(dir, strafe); if($level.map->can_move(move_to) && !$level.collision->occupied(move_to)) { - fmt::println("PLAYING WALK"); - sound::play("step_leather_1"); + sound::play("walk"); state(MOVING); } else { state(IDLE); diff --git a/sound.cpp b/sound.cpp index d278ec3..f3b381a 100644 --- a/sound.cpp +++ b/sound.cpp @@ -38,17 +38,26 @@ namespace sound { void play(const std::string name) { dbc::check(initialized, "You need to call sound::init() first"); - dbc::check(SMGR.sounds.contains(name), fmt::format("sound {} is not loaded in map", name)); - // get the sound from the sound map - auto pair = SMGR.sounds.at(name); - // play it - pair.sound->play(); + if(SMGR.sounds.contains(name)) { + // get the sound from the sound map + auto pair = SMGR.sounds.at(name); + // play it + pair.sound->play(); + } else { + dbc::log(fmt::format("Attempted to play {} sound but not available.", + name)); + } } void play_at(const std::string name, float x, float y, float z) { dbc::check(initialized, "You need to call sound::init() first"); - auto pair = SMGR.sounds.at(name); - pair.sound->setPosition({x, y, z}); - pair.sound->play(); + if(SMGR.sounds.contains(name)) { + auto pair = SMGR.sounds.at(name); + pair.sound->setPosition({x, y, z}); + pair.sound->play(); + } else { + dbc::log(fmt::format("Attempted to play_at {} sound but not available.", + name)); + } } }