From ae2bf25be239b29f8d1f0b4f2ab4d7b91c02013e Mon Sep 17 00:00:00 2001 From: alexis <alexischapusot@gmail.com> Date: Wed, 19 Jun 2024 15:45:02 +0200 Subject: [PATCH] merge --- .../MCC.dir/src/manager/SoundManager.cpp.o | Bin 39208 -> 39232 bytes build/MCC | Bin 13619344 -> 13619368 bytes src/manager/SoundManager.cpp | 2 -- 3 files changed, 2 deletions(-) diff --git a/build/CMakeFiles/MCC.dir/src/manager/SoundManager.cpp.o b/build/CMakeFiles/MCC.dir/src/manager/SoundManager.cpp.o index 1a1f2b340e1392920c17de25e17d8eacd0de51fa..824c879728a7d6583c30dcf9e61e6a6f7258ba4e 100644 GIT binary patch delta 898 zcmZ3niRr*5rU@F14jVOhvN8&7e$0AMl}+H8G6RFz<W<^Ix%><a3=At&7#Nr)W-thx zRc2r?;#UKSL9h{oVqlyjqsG91s(6bs1B0FoR>hteil-?vFlbIT)R9s|Hbenryr$MY zCXoFp3<4F(3=FE1b9AKYF;uDQ!Bx2_GcYLLN3vKJWDElX1LK@G=oZ_=D>E=KvGJ-y zl`t?cAXH1Kqx(rhg@HlLN}WL)uDl4!Vw~fSq58iv1A}1tWPM%H$VODj2t|-K;T#5# z$8s11bd?zxcorf#!WkqFcJgj)I{9EaZ70vwm9(@IQD$Ixtj@r|^j4jL!5*X+6lV+$ zSD{AoXn@2ZcpD>xW}M^rc=LN*Mn+y%24+4_VG~Iv2?hp%$shEjHjC@$FoiL?3tMqp za;FFjG77OfNYqF&3NtX+>M?+Xt+_3^VZsayc6yBN!YRTE+#nV9Fyj~)9P}6sh4c6j zCNMBKZa!rAn~}?wmH#s<<9t>v@6E@JB|{m%Pkz`T&d4`;VW&8w%4ES#aYkz}J8-gN zr#NE<m|Zftuv1*J8|o#HFPIn@7!n}9VORuKvks(&@$lq}o#Kp7z#^X}Gj@qH{@N_r zrOv_lVzc8Udqzfw$&HiS8O0`ZPBCZfnCv*kp7Vz;#F*EUJExd4KAwDVian#pWX7rX zjLMT8r`j`4nA|wkp3!ac!KwC)2PQL4vu9M9>^RMyF=KM$G<!yg$p@#|Gd4_SoNmvk zFxhdsJ)_U$#_9Hq0h13-w`VMv%s9iIamHlF8TO0@lN)D%)Et~)&-h|8<4kn`ixjcL delta 943 zcmX@GiD|_qrU@F18XGltvN8&8e$0AMm5u+IG6RFf<W<^IxdIFf3=At&7#Nr)W-#!d zRc2r?;a3BRL9h{oVqlyjqsG91s(6bs1A~DLR>hteil-?vFlbLU)R9s|HbenrytdXo zCXoFp4Ez<!3=Ha%b9AKYF;uDR!Bx2_GcYLMN3vKJWDElX1LK@G7#7DXGcd^Ws6$mS zFfbq#ORA%LNkWBzLCjK}fk6wVz6i=-oa2U}`oA&*gJ9ZZ16|R`22{xiMUXb(90riT zav1n^l^Ga#79cso86*#O@h)sS`CvM2CePEAw6qmbW?*=v&cML*MxBAd4x|?pWeoOL zphj|QfW#np8zY2foa69l^9Nl<#>xNmq__oG8JPJzg-s-xBsPob=P}tcxC>ixTXS1- z3o;6^J4n<>GBDWcF}e$<2rF<i3NtX+!89;1*y}MG3g_{q2qTm_Y`$gqn~}?omH#s< z<9t>vpUwA;B|{~@K_dm^1SSRshA0q&fq{W{vS6pUq%zdCAVHAq3y4D*tiZAXXtGP7 zvgsgM#^T8rJH;8hCNJz1XIuytSql<jJp|G<nQ^i(<71Gh<VO&nfq{Vwif=(p`MKG! zOPz!9!sf_H_Kb`glV?tDXB3^RIK`Z?U~=RXd(Q8=5QSGJFPvh|czW{9DfWy8lO?Cx zGjdOkoNCWlF?r@xdq%y<H>cV&u9z%2&7P5Ga^y67#(>E)r`a<yOujkIo-t#x<aB#R zj>(bJ?U_uxCl?xtP2MnFgVAF0&FS`x5tAin*fTavj+|l7C^32F43NT`GweAp^g}ET Jp8RmCJOJ%Mu73ak diff --git a/build/MCC b/build/MCC index fe647a54c0eb79926d658d5da3af26ac3da73dab..9c769a71e84b43bc32bd2d88e08b87c8cec7ba06 100755 GIT binary patch delta 1601 zcmbQRa6j9Mh5OkiXfUqWsOirva!Y=F#FFK=Y)joTeqH{5_;0(Z{m$kd=Jp<D#`Yd& zruH6Y5SyjFhncm#hncOthnc;-hnb_jhncgzhncIrhnc&*hnc6nhncs%hncUvhnc^< zhgqP#hgq<_hgqn-hgrD2hgqb(hgr0}hgqz>hgrP6hgqV%hgq_{hgqt<hgrJ4hgqh* zhgr70hgq(@hgrV8hgqS$hgq?`hgqq;hgrG3hgqe)hgr3~hgq$?hgrS7hgqY&hgq|| zhgqw=hgrM5hgqk+hgrA1hgq+^hgrY9huNULhuN^bhuNsThuOHjhuNgPhuO5fhuN&X zhuOTnhuNaNhuN~dhuNyVhuONlhuNmRhuOBhhuN;ZhuOZphuNXMhuN{chuNvUhuOKk zhuNjQhuO8ghuN*YhuOWohuNdOhuO2ehuN#WhuOQmhuNpShuOEihuN>ahuOcqhdH3V zhdHplhdHRdhdH>thdHFZhdH#phdHdhhdI2xhdH9XhdHvnhdHXfhdH{vhdHLbhdH*r zhdHjjhdF+G4|4+7UdFQa=?4<pryodcpMD^zefojq_UQ*w+NU2#ZJ&N1t$q4|^!Dio zGTNsf$ZVf}Agg`)f$a9_2Xfk{AINQ=eju-X`hooR=?4nhrynS6pMIdIefojo_UQ*o z+NU2VZJ&MsWOjM`^aB;`(+^a(Pd`xAKK(#-`}6}f?b8p`wogA$*FOC~ef#tS4eiqp zG`3Ga(9}NtKy&-_11;^-545&VKhV}b{Xl#B^aCC3(+_mEPe0JrKK(#<`}6}n?b8qR zwogCMw|)A7e$CsALfa3{o^VjLUf`KB1B2NkRR)HhS&j@KU<4u<7#JAmyjNvl;II13 z%&<a*fq`ja27|y^Wd;T#el-S$C=A6iYUql$C^InV*{CrvXkaMzgem5O8$C^#fkAUR z|Dg#|ipX{<DBa{>(A2ue1ad(NgFuBc1B2>xuR{~0>M@k5>cN${DKjuA-dAH_=$Z-f zl`Py>Z(w%AthR|)W?*1q<5g#1$iYx8rH<|`2^9tgF)MY3>5mRg5YBPOkpHjDz#y2e z&cLv32E=L?xYdoQiX#+Pb@DL?=P-c$mct;RtIWW_vrwIZp$Mwe8Lo3TNays#!xJPK zZKqcso*?OEC!);2@K~LJf$6O}1A{#*niw3esxvTHck(gtXfQDBgNFPzMu<s_a~#21 zCT1`&JQw6-U}a$B*wTLQ@PzhzhbOk*J3OiV-r>pZ_YO~Kzjt_Q`@O@{+V35n-hS`! zjP3Uh&s_3Um6d^+&r{e$l1YMrK|qhuUD!&I$(q|zku617kWq-;L83;IQF#0Em9z4g zVnDLomfXlP3=Fn<4DP~K+}7Nd+%OFc40a%sQiK(_8HE`b>|u5=FgWNj8Vcv}AxvOk zaAajL6lRi`elBB{YJ2^fS?%>}X1CX`nbTgsW^Q}^ntAQ@Yv#AtuUXJuzh+^3{hCGX z^=lTl*RNU9UcY8(d;OYa?e%Mxx7V*((O$o1WqbXaRqgd_R=3x$S<_y>W^H@@nsx2< zYu0bCU$fzPFqbVW|7TXl`K(&rtpyuf3pTYDY;G;s(ps>!wP0Io!S>dI9jygBTMKrz z7VK^<*wb3Dx3yqjYr+23f&;Au2U`mcwH6$1EjZFzaJ04HSZl%Y)`AnQ1t(hzPPG=C zZY?;|T5z_t;M~%J^XC{7rx%_(Z_at}>P&DXHBR4n?z}mp)AX0;&f7B{pRRfSyglQN h>6sv^Z~96Q<uUywh)S5QdEvZ06W`J4Sr^W$0RWocENTD% delta 1574 zcmZ3na6j7w5Y}Lvuu;>WS;VYbeAXZB=Q8ZI<>n&3e->ou-^p$6VQ%kXW^C_aW@_(Y z2C-S%dze|<dzjhUdzjhVdzd-edzd-fdziV}dziV~dzg9Jdzg9Kdzks!dzks#dzb~< zdzb~=dzgjVdzgjWdzeMqdzeMrdzi)Adzi)BdzdBKdzdBLdzhu#dzhu$dzfX~dzfY0 zdzj_gdzj_hdzcm4dzcm5dzh8ldzh8mdze+)dze+*dzjVQdzjVRdzdxadzdxbdziJ_ zdziJ`dzf|Fdzf|GdzkgwdzkgxdzcN{dzcN|dzg*ddzg*edzekydzekzdzj7Idzj7J zdzdZSdzdZTdzh`-dzh`;dzfw7dzfw8dzkIodzkIpdzc;Cdzc;DdzhWtdzhWudzf9? zdzf9@dzjtYdzjtZdzd}idzd}jdzii2dzii3dzgLNdzgLOdzk&&dzk&(dzb^-dzb^; zdzgdTdzgdUdzeGodzeGpdzi!8dzi!9dzd5Idzd5Jdzhozdzho!dzfR|dzfR}dzj<e zdzj<5_b?}L?PV-&pMD^refojK_UQ+b+NU2#Zl8W2rG5H=)b{BI(%PpVNN=BhAftWy zfz0;l2eR6yAINT>ejulP`hnc`=?C)Krys~~pMIdAefojI_UQ+T+NU2VZl8Xjq<#7U zkhx{;(+`xlPd`x6KK(#t`}6}<?b8obw@*J%(?0z`ZTs{Cb?ws+)VEJR(9k~pKx6y# z15NGI4>Y$=KhV-X{XlE`^aE|}(+{+_Pe0JnKK(#v`}6}{?b8o*w@*LN(?0z`Z~OEE zecPuW=-0f>D7gLL><I@|>-nE4GcZ^@Qe|N1ndQg;0!AQ$fq{W>&U;k`27#*2%nU13 z7#Nr)W-#!dRc2r?;a6i|h{8}TqlT_{i!uX)fsGmig9e6TPncppxY5&;85p#u^B<ZZ zrHE{&g3?V625qf-OduDeFz{C>Gcc%6_c}B|svbj`x*lAan=%7~@_jW1hOU_qU&+FK z^#*1)-0FB`1_pT^bq0nU48@Y_=)RIrVPFumRA*qA{^ZaEp?WtA1^<;97zESQ85p+B zfLQGUx4HpUafITkPCf?V90rizav1n^l^Ga#7N|2Y6hU=5!*%Y$rjsv+fgPgNW_r!x z36fs6BFYR5kJK3$nBJ%}FxbJOj=}zlIs=1sCm#d11_Q%BXl!g_gqY4a#{sNmVg>`l zb3sl9Rt83nx$XB4PiVh?cw+ng!;{+YAD-NP|L~Od`-i8t-#<L9{r=(U?e`DQ*na=; z%q35!Pgpriid%q{ftk-!*hG>^V*84fv+|hi8Qg`fxUIP@xdj=8*c~KlBpDcN^%&iS zQ-l?`8HE`b>|i<=80_^J4TbagQiKso9olo&%xceBGrK)!&7Ag}HFMi@*34_qSu?*q zXU&54oHYyEbJi?s&snp$J!j35_MA0K+jG_|YtLD;ygg^liuRl}E8BC{tZL6$v${QJ z&6@U{HEY{*)~svKS+jn7&YBHEAzXH>{GVAF=d)`0w03N4?by`XvAMNlOKZp0){bqh z9ot(wcC>cvZ0*?9+OfN}V^3?x-qwzNtsVPYI}WsV9Bl14)Y@^lwc|)@$I;e~W33&> zTRTp)cARYOIMv#5y0zm>YscBvj&n;p&YxpUnBIBrygBEAt24o&oi+XBx%1|XTGJWN ypSNdRKiv^TEtuX2qROTp1W^Xl884i-XY`ovc;UP~*S90*!5U{WPUkv)UJd|3gC<r0 diff --git a/src/manager/SoundManager.cpp b/src/manager/SoundManager.cpp index 6bce9d6..02d0fcc 100644 --- a/src/manager/SoundManager.cpp +++ b/src/manager/SoundManager.cpp @@ -27,11 +27,9 @@ void SoundManager::freeMusic(){ Mix_FreeChunk(this->walkingGrass); Mix_FreeChunk(this->menuMusic); } - void SoundManager::resumeMusicBackground(){ Mix_Resume(0); } - void SoundManager::pauseMusicBackground(){ Mix_Pause(0); } -- GitLab