From 2a194aa4fd78e05ca38f60e10fecd32b41690ac8 Mon Sep 17 00:00:00 2001
From: marouault <martin.rouault@etu.uca.fr>
Date: Mon, 7 Feb 2022 08:34:57 +0100
Subject: [PATCH 01/14] Ajout du menu de fin de partie

---
 Pontu/entryPoints/main.c     | 11 +++++++----
 Pontu/src/view/MenuEndGame.c |  4 +---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Pontu/entryPoints/main.c b/Pontu/entryPoints/main.c
index f61fe0f..cf480dc 100644
--- a/Pontu/entryPoints/main.c
+++ b/Pontu/entryPoints/main.c
@@ -38,12 +38,15 @@ int main(int argc, char const *argv[]) {
     }
     FontHandler fontHandler = loadFonts();
 
-    generalState = GS_Quit;
+    generalState = GS_MainMenu;
     while(generalState != GS_Quit){
         switch (generalState) {
-            case GS_MainMenu:
-            mainMenu(renderer,window,&generalState, fontHandler);
-            break;
+			case GS_MainMenu:
+				mainMenu(renderer,window,&generalState, fontHandler);
+				break;
+			case GS_EndOfGameMenu:// Coupler avec le menu de jeu
+				endGameMenu(&generalState, window, renderer, fontHandler, NULL, 0);
+				break;
         }
     }
 
diff --git a/Pontu/src/view/MenuEndGame.c b/Pontu/src/view/MenuEndGame.c
index b13efea..3cd045f 100644
--- a/Pontu/src/view/MenuEndGame.c
+++ b/Pontu/src/view/MenuEndGame.c
@@ -143,8 +143,6 @@ void drawEndGameMenu(SDL_Renderer* renderer, const Player players[], const size_
 }
 
 void endGameMenu(GeneralState* generalState, SDL_Window* window, SDL_Renderer* renderer, FontHandler* fontHandler, const Player players[], const size_t nbPlayers) {
-	
-
 	int windowW;
 	int windowH;
 
@@ -175,7 +173,7 @@ void endGameMenu(GeneralState* generalState, SDL_Window* window, SDL_Renderer* r
 					switch (inputElement.data.uiAction)
 					{
 					case UIAction_Quit:
-						*generalState = GS_MainMenu;
+						*generalState = GS_Quit;
 						break;
 					case UIAction_Validate:
 						break;

From ec52ebd10cd1f4a984a2781780804a53fcb08df7 Mon Sep 17 00:00:00 2001
From: marouault <martin.rouault@etu.uca.fr>
Date: Mon, 7 Feb 2022 09:05:58 +0100
Subject: [PATCH 02/14] Appel des fonctions globales

---
 Pontu/entryPoints/main.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/Pontu/entryPoints/main.c b/Pontu/entryPoints/main.c
index cf480dc..684c118 100644
--- a/Pontu/entryPoints/main.c
+++ b/Pontu/entryPoints/main.c
@@ -2,7 +2,10 @@
 #include <stdlib.h>
 #include "engine/GeneralState.h"
 #include "view/MainMenu.h"
+#include "view/MenuEndGame.h"
+#include "view/GameCreationMenu.h"
 #include "engine/FontLoader.h"
+#include "model/Player.h"
 
 int main(int argc, char const *argv[]) {
     GeneralState generalState;
@@ -44,9 +47,22 @@ int main(int argc, char const *argv[]) {
 			case GS_MainMenu:
 				mainMenu(renderer,window,&generalState, fontHandler);
 				break;
-			case GS_EndOfGameMenu:// Coupler avec le menu de jeu
-				endGameMenu(&generalState, window, renderer, fontHandler, NULL, 0);
+			case GS_GameCreationMenu:{
+				int windowW;
+				int windowH;
+
+				SDL_GetWindowSize(window, &windowW, &windowH);
+
+				gameCreationMenu(renderer, &generalState, &fontHandler, windowW, windowH);
+				break;
+			}
+			case GS_Game: {
+				size_t nbPlayers = 0;
+				Player* players = NULL;//...;
+
+				endGameMenu(&generalState, window, renderer, &fontHandler, players, nbPlayers);
 				break;
+			}
         }
     }
 

From f0c29957335dd79897379fc067eeffb439b0bf58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathis=20Rib=C3=A9mont?= <mathis.ribemont@etu.uca.fr>
Date: Mon, 7 Feb 2022 09:55:57 +0100
Subject: [PATCH 03/14] =?UTF-8?q?isButtonEntry=20pour=20l'entr=C3=A9e=20du?=
 =?UTF-8?q?=20curseur=20dans=20le=20bouton=20+=20bruit=20au=20bouton=20hov?=
 =?UTF-8?q?er?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pontu/entryPoints/main.c              |   7 ++++---
 Pontu/include/engine/AudioHandler.h   |   3 ++-
 Pontu/include/engine/Button.h         |   4 +++-
 Pontu/include/view/MainMenu.h         |   3 ++-
 Pontu/rsrc/sfx/menu_sound_effect.wav  | Bin 0 -> 454964 bytes
 Pontu/src/engine/AudioHandler.c       |  13 ++++++-------
 Pontu/src/engine/Button.c             |  18 +++++++++++++-----
 Pontu/src/engine/GameInputProcessor.c |   3 +--
 Pontu/src/engine/InputProcessor.c     |   5 ++---
 Pontu/src/view/MainMenu.c             |  15 +++++++++------
 10 files changed, 42 insertions(+), 29 deletions(-)
 create mode 100644 Pontu/rsrc/sfx/menu_sound_effect.wav

diff --git a/Pontu/entryPoints/main.c b/Pontu/entryPoints/main.c
index cf480dc..b679198 100644
--- a/Pontu/entryPoints/main.c
+++ b/Pontu/entryPoints/main.c
@@ -37,16 +37,17 @@ int main(int argc, char const *argv[]) {
         exit(2);
     }
     FontHandler fontHandler = loadFonts();
+    AudioHandler audioHandler = newAudioHandler(128, 128, 128);
 
     generalState = GS_MainMenu;
     while(generalState != GS_Quit){
         switch (generalState) {
 			case GS_MainMenu:
-				mainMenu(renderer,window,&generalState, fontHandler);
+				mainMenu(renderer,window,&generalState, fontHandler, audioHandler);
 				break;
-			case GS_EndOfGameMenu:// Coupler avec le menu de jeu
+			/*case GS_EndOfGameMenu:// Coupler avec le menu de jeu
 				endGameMenu(&generalState, window, renderer, fontHandler, NULL, 0);
-				break;
+				break;*/
         }
     }
 
diff --git a/Pontu/include/engine/AudioHandler.h b/Pontu/include/engine/AudioHandler.h
index 0163bab..01be82c 100644
--- a/Pontu/include/engine/AudioHandler.h
+++ b/Pontu/include/engine/AudioHandler.h
@@ -31,7 +31,8 @@
  * \sa #MACRO_FOR_ALL_MUSICS(M)
  */
 #define MACRO_FOR_ALL_SFX(M)		\
-	M(testClick)
+	M(testClick)	\
+	M(menu_sound_effect)
 
 /**
  * Macro used to generate the entries for the musics in #EnumAudios.
diff --git a/Pontu/include/engine/Button.h b/Pontu/include/engine/Button.h
index 1e7be9c..eb728f3 100644
--- a/Pontu/include/engine/Button.h
+++ b/Pontu/include/engine/Button.h
@@ -58,7 +58,9 @@ bool drawButtonOnRenderer(SDL_Renderer* renderer, P_Button* button);
  * \param[in]   y	y of the point
  * \return SDL_TRUE if the point is on the button
  */
-bool isHover(P_Button* button, int x,int y);// dit si le bouton est survolé en donnant les coordonnées x,y
+bool isHover(P_Button* button);// dit si le bouton est survolé en donnant les coordonnées x,y
+
+bool isButtonEntry(P_Button * button,const int x,const int y);
 
 /**
  * \brief Free the texture of a button.
diff --git a/Pontu/include/view/MainMenu.h b/Pontu/include/view/MainMenu.h
index d8aa932..af1e5e8 100644
--- a/Pontu/include/view/MainMenu.h
+++ b/Pontu/include/view/MainMenu.h
@@ -7,9 +7,10 @@
 #include "engine/TextureLoader.h"
 #include "engine/FontLoader.h"
 #include "engine/GeneralState.h"
+#include "engine/AudioHandler.h"
 
 P_Button* drawMainMenu(SDL_Renderer* renderer,const FontHandler fontHandler, unsigned int* nb, const SDL_Rect* windowSize);
 
-int mainMenu(SDL_Renderer * renderer,SDL_Window * window, GeneralState * generalState,FontHandler fontHandler);
+int mainMenu(SDL_Renderer * renderer,SDL_Window * window, GeneralState * generalState,FontHandler fontHandler, AudioHandler audioHandler);
 
 #endif
diff --git a/Pontu/rsrc/sfx/menu_sound_effect.wav b/Pontu/rsrc/sfx/menu_sound_effect.wav
new file mode 100644
index 0000000000000000000000000000000000000000..773aa5b8b86d38dae0e5483ec5c6e8806e46882f
GIT binary patch
literal 454964
zcmeI*2aptn`u+XcoO41ll9h}oNhJ!BMRE{9B%@@MBoahXl1daMgA$b_q6Enxh$05E
z5|_=(=GgyprmODTZ%yqMUR*EmJJzSB#v$!~r=RYg>F(L~&p-EEr9^jI=Z2k{w&>WV
zWl>xH|MeR>s$?L3i<8aS)?}m2w#duX=58xw>)U%&?@0;n|Gz)%YO?|UM(AUA#b$%K
zPBhV(*1J#<H~Q6`E_hN+ANtFWq5`R1DB+)iIYnq@aeA#3ttvyC%F}_z=u&0+y&7Gr
zNnbxnbLvpt`t<WN^mId-(wLSsrHRd`>hrX$1^v;I4!5Eat?9Vkxz;wAX&2SX2G?8C
zloqtLIZb?y&NQZ74XEVP6i|oWc!GLWrLQZ}w9>S@D0K^??tZk#mBwTlFg=m3-=vQ(
z(9F|x^Z+&9LD_35Y9aZ(OFhTZ@2}FB7wM@66k3VAA}Gj-Dn{i(i!(Ix8(O-I4o;)1
z11Pm6Wmcx!{<JqP2gaNtpA9r_2JP)bztpE~Vbnb~8;%^Lghh0A2)*_!?GB`Ee`dkJ
zEtEEiUhP4Bx>K{kv|uQCjHV8g>CijW?PEIkDcLqs;cqD97`^fb9gn2HvZ$7SHk>L=
z{c2Osb~L;{?R%R>enKU8(af{7Hi>=@&VjK{(8Nyk^*CC-jAkC8SK=tFP%cC@qH(WN
z*H7ufN%|#+dQ>xDTwf}>gogY~b-ZoxTNARqO}_hRPA<7OaDvP!6myh%`#ZyxPIPNI
zImgn*x-KwgCjEASUaIN})2Gp;3v}@bHwc?cMhrdH${hkW(bIt*P<1qoxJXl*dP4M<
zRH?WZ{4k5!81&>wZ}7WK?Rxvb2N$S*7hg#DjY@R!gO@H)$=?1D7fB~y4*=)iX|G+&
zNdb`c9BnK_mrwdbr^U4H1&RowjFW!w`xL7345h^SLhKrP{{`CZN@*K?;HPf%o8b+0
zKc~p&>1K=<xV%qaS0Lwup74HmI+ExC^`=wx2wJ|z9UiSoAAjct<C{|AaaVYx4b3~{
z0_R#$i=)o4s3E29bb`v2=+&h*=;ljLj5T2IU%BvpGpevT2QGzB@k!ax?nV~0ZbNQ6
zGpPi9_)Z4=7@rQ+I@1UH)8I;ZYB(<y7N@5`LT~DLJQ<eMpui<b(7=U`47vk<{*nlz
z>e2Ys2~gOV0!PQgu8VQ-X;W&mDHh6v)5VD~u;ykoywZkBeH{fii__8>w_#v>B$Vtz
zbq?HuWv%FHS1J}73B?amM%~*`IFj~^iGqfH(GazP%GZg3qZeq_fLIvs6$ieHY3Gyi
zF!wk;+BX3XWKit9M3`Uk4utNf!d;W#y*L{1ZZgy<mIAZCrr=ho@YzlB9iIj(!_uMX
zdRoyW1L~in<s&m;pl24WT1lTil@05DrnCKWV1q3eJQmRBRShV2nC8D^gMrDEHOmPe
zDdP;&_R#qkU7$iNt()o!my5c=Tia+^D|hI5jrvXSfM-KIq2@*^-PjA9FOvI6Z}{2A
z2X3yU&+7TYfipB<upcaP_J_wmp?)<2;Pwfs)F%*@XHwL>AZYtoFf9L`(z}L0+eBLW
zUMOUg41;>#(6V;na6XcnO^$%CBML!-PwAQOX?G=x>=yx@;=*A~YpVEV7`#`OGAD&X
zR&of`Xix7S2!@?yY3AG@cr`r`Uh73QPXs_nRqFAHKQu7>pvVw9aM~A^)u%DbeZbw1
znh*DeS1)-%`9^ePlP3g(P>o3*kaf)+zGy>{+ufi_3Ho)qE9{GRp-$9ozcZ{ZPib?V
zU_!bLX7r}w#|`+tI*nMI3t`UWG$;qAoymsfb;);C7Bu&vH6t@2<3a{J--N#0m=4LI
zG-zTPtiF*7rQ1-)ohfj!IJwP8hI#Qxu&pyS+J6UnR-ov)iD1h}fLXn1>G61|P=jhL
ziG$tFw0}@6H2oz8n$@G@tD@nA4>cbZ1<zl+4M&>LiH(u)P8hX$=N1&IM{7T&q@j^;
zHkqnVy$$0kM?t%-RHsWcY`96ar^LX@M`EGIW}4k14z6FIka6+wsdobW_BmaslL$?I
zr#1ucz+$%~IK7C{YbHaBV>F~s3Vf4BS#wk2k@9J<b|1agDIEsI(KpjG;JIR%kh7hh
zXq5%^uTzcj*)S?32kNY+)s1qY;W_$#xB+!MZSco(diyCS81@qt>hBC;HW&C|0iCMq
z3bT&TN4?yjTPpRQ;|^8IdB79<$g`6tc*WE8>0WT9xHo*igSNHtfu%QS+9Y2X8RiFV
zH&c_Q{t$YZ0!9bG8NWbUP47M(1hdc5lS6}{k!uKCUP|#bLt*ksTJ%a7l*p!MJ_?6@
zk4M0z12m^|A(*tED$S>Qry}57WeWZ>9M0M(Yit-yIUfq^8q)qPA@D^24Szcr9{V#0
zUVDMoe-#LqOH!Yy0q|UcKiE3brG0)ds2pvc;|rgq`M|DTwEmbkBvqyPi@l(ujfM>J
zgx`PifLirv#0qyv^Py5B++fE=SGe4WMr?9{)ge@Ak~0jw?gUrbP?a4v7+HeWPd8v~
zd@i_lqQLz*FuNShoSO|*)3PA6H(flM37e|Zhl?_xtuwVAm=0-Y(!i%Kty+}|C%mcc
zs1$hjLNa7Dp@tiiU_}_EPPhY&ZzjU()^ufO0<<Vjqh`dz?YKB_?m}<vi-q?pkpJ8m
z@Xm;a1uxS($D^Qdbut#;hR>YntwE8n@|Roib|+fcnvQ4Cv~7{#_1JCr<qR$D9|dF5
zsr@I>;8QLJHXNtVJH^7pRN6Zu4qhr953lW_1ML!EZX|7*lnAv8-2vB4G_zR}Y`j2g
z$0Wl{?-W?EhTgA}3Ll)MH3QOMgiAV{UPxVQWPs~YdaidSG)SeobF*M_*=%@XAMNXq
z1J&awV`?r`EM`FQZ4}hX2HmgHYvY~3H`p0c*3-#`F0lAKEgbF&ZN1%K=n4v~>kiNV
zOn(gYfXAFXVeMk_t?mV5k5k;s-q1XQPR;d!h>E_jZa-b^;s@gr=!<v#p;^fQ7`Tgk
z+Xcd-k#zj6Aow*R7$$9@$<0FGu`5(|Y$%-Z4}&9XY0NX>(Em3o_F4qYcPj+$bLq(=
z)ZjTvd@}-m$_|IMuaMLJF!-%D4VV`SFS=9Yt07S1mtfdbhn`sx1SNgxjbVZC!KDD0
z-hf`%><|7yv}ckZocqfcj5c&=s}DR?g1(#T4P)ZH;Oh=_V4o*!DN7~hdcc}gcbM}s
z%|Ge}fz@g1B3D@9M1u#qz|&`(p-o-7veF64_|TY<HaK>{fZdHLd}A*7h0?MKIq=r?
zY<Q|Q`RvGo^Tp`%>6!3OTn4o3M0NJ1gRMNp&q;%AX{oU0W$Je<1-ezI!i$r^*O`78
zm;}4e+<`ahQtwrXP{N0tM<u}C3-Rzt6Y8`v4jvDqn-gMT+l?3))|zVVjE3Z5wEdkZ
z7!!9Js&}T0y^-)sc{)G;7JOHqj?5sZ&XKV27Dc>v8x9tU0>2ehv`I9){~P@^GzMyT
z#ln~+G_Xz_Ts}rk2E;?9bb4<=0-P?N2&)g#+nw*gi91w!MiPXUN`_54X-eA^D0-7Z
zC#AyZurxTjk@hr6hlLj?b7Tfg^3H_nt7v?kEa-EF-WiY$bDVNu$wJy*Ef+Q&p`*PF
z*pfm&&9*^G87Jtrmp<;`3~8~{W||9pQOp&>w$q^2ZgA@w)tu-KdqX_HwuzQB_Jp4=
z(zuacu*%mPx~`(p^?jiBFVu91FNC=GLBLYFRl^_7{6O3K1i-8;8uMWwG<rM;o;W}W
z-GU)1krvGifhDCvq26w4@<JG#yG_xP!(r?r5isXVdhfYH(D)mwv4(PQMnGacI({G=
zqC#o;j4&7+9}1^lpbrm*fPX0p|2P=lzY_#4UZG`&0-=2k`eZ=>EO4Uc1N@=d&wj9`
z4i#GA3wyk&;cy>Vd%+u)Hl)`#dO^`(DmT#+zP;)JzqY1f+uY&p;`GEcH>ecv3N9V#
zk9{uiTUnYq*BREQI>F<;Y4lMW?5<8uiwuZyqMieCq0N~bh^<WrR%XLoFKRwA3!XWj
z2^Skv()tXT5K3Fdr$gx*Y4Cb0`e{chR4Yak-${YE*kq{CnLgi}1V5Ii?sM+Iu=GUm
zc$s{UC&1=vv}$oYv~i**2F1aRpJQQ9T^hAA2A=Vu%n{MB`$7~<XiPOX-iF)|+BzW;
z#@x6Ck-h2dCiLnRTD39~Y8Ac>h4;{lU811=bxM6N8uo?6z_Fe5TGLoaxJrMHiG!U1
z@i1*2HF-J#hWt(=1}DNP_dDRfgwEGWf;-3P+rG)*oKEk4lmeB@r$V~}G@w%&6iKA@
z)6*foL<Yodr;}|m;fd?CePR}j3(1Cc8);vo99VIIa)#%^5^n>_t)QuOY|!H;`fY#{
zc-x$z$09mZ)dif6(fhqzVOJXUn&So&%DY3|ebl_O2NaH{M`n0JMsY8Q-buf=@rFG&
z>8nXTFgx5A-rGz)pYwwrm#O?1f2iOe05NOqo(_z8I`H#fY3<M;=;0O&T|OnxS|Q+k
zinjC(h0n9;#gD_Fb)|4fJ4koBM?kkETK{$-c={N<{Ss}T9Rbt4Y5bevFzu%>Xwj0E
zuMP#@2=W{k0;{hD!`9a1vo#1dmY`#A2f~L50noZV-QMpHwMvuAJU?if><j+A>7~Oy
zP^LPKT;L6DoM=LSFPQzaC%jpkZmsZuAzsvZggbOS?*^9|QKJp6Fgk?FPH=%ot~-Ns
zYdW~y34SU@eWu%BSeyadI?|54x!_)oo|=;bZ>46#@m>^sGz<Dyqa6z~!Ow|$56FPs
zKc_=T9U8bY4UTzHk&&q|`FskTYD~2^B*UaoiW{E<kKech%UaP-I})K;F&g?#0z}5f
zgL7w^vNsOqmZz{evG7QG46N)$OOHiE#cK4(;wac;qmKvPhN?eDLg~6xc<n8SZa`H=
z(aL8c;hFPvz3Xl8@QQ*@=hD=w(XjXkt>_v96Vj>Jj9B=gd>nMxNogJ9q3TUKJv9N!
zh9|<-uPC?a9XNP}HjYjLZ~tVdyoRRKPl5N(QklW2aM~peq8F1(&2;$b7**+$0VmVw
z#d(=<zFZcJ+)v3Jvtdp=g-p+ZwZ(Ix#&+7$+JFYvXww86%m{XZ$2U^dM$WMR0>ut@
zfx$km@bwBRTh9$<{!EdB+@Y_N2W(qHO{#msloM2;w-<ECB%gWSQ1&q&h~7_ky86Q5
z1p4MZKUiGSAI5z{{n`b<leekz<Uoim6hvF-)8@gj<_a}^BLq4Ggu;z=l>JN?O!=Kw
zz7`H8JR+dQXB1JZ5CnWlZMRZ)C-Q9>0gcXv!=;K8w;&8^xl-poq448xArM%T3a<@@
ziEgxUR1oC;9th(aQ_%VVI1o&qkN1ZOSN-6RRy1d;FYGTyH>dc(gg9>)@*)-A=LI2U
zXy+VH_&M1Fn!ik+9d?I{)o9cLHyG(e?fSby;29UFTAQ}6bOwJf>M+s?uAQ?{V;aBS
zfY4C-ZCox4y`BU8TGGYs+2C1}UY?!>J7Y2-r6Ud9lK~6M(POjIp+Q<2+<u9okEX)9
zs<d!X3iPp2qk+j#_~#^uszaw%+=02?G=4-PRJ)J>k2a<g8{%Pq2z8qf2OX}*!nIcP
z=k^$QwV2)X=vSvlUyF@`$d2^#-rF#^9Q`#r5~io!f?coCq-SW}VJba05{CQShDX-X
z=H^kb@h3VnHX5os$3V+f^yL$=5Pq7f^@{_iY?`$o9<EhPfUqMpq)Q?cOQCKv?!eX3
zN$~bgn$<oT4&R_^Z>K;=SSp;`LVcU0!R*Vlb!0lU_sam=DymRF6Iz`i|G`<Xz$qJ?
zm(ay(Iba;4LNDh+MjAac$AD|)Y%pLiRqf;i0dcf@x-%Rq<^p|p(7UZ&q0|lPI?)Xx
zL*1e3Cfd=&13WL$j8UF&)z=HUuckfqy`jcgS~$c9yj*?Z^`&&NrXM_elGeZC4<6a{
z+D8F!^zlG={2)#09t2nKP}TQ?;iE@G;QVfSrhO<(j-nfHhry$T!(rxEbny8I@cD~+
zj3@*{j*>BoO0J23pCah=>~Ki<D-167pbvM2!VBf8&+HHgN)Couy{XW_AUI!x-ux&K
zs=Cmmz5!6|7k}7Si;`FRftv^YF~S$>{^0|EG@>qFctb`oy*$nf>Rt1M&Mj%_HV<fA
zlnPCAhjOuQu%QFF>~)1UW$FBE7syU=hR=J^<|9rpq#AWyXag@N`nJCT&412?klJ)`
zMGk!ANv%d?L#1<B@Mk0X`HM_=D}*MG%Ybs%)8WaMbY^=RBo?8m(^Fw{ObR^Fi3aUS
zhQG>Dso6;|GwlwXd5IoBmI&jk(vd|8P|`*{2gbwRpW+~<4s}=&3!}X0>hKsyIUfxJ
z8`0|<q97)iBFEo`*RMsw&{mYV^A-$kMzvp|a%Cf7&`CP=+-+!<LT4vO!P>&nFncF$
zZW;rvZc)oov9LTW4%)A#YK`Mz^;!CMSOT1MO@yhR(Z(n4z=D(1tZxz|WYXr3l3`lK
z6o@}SO}nH*p*!^0j5MfGDjh2Bq{i(spzaNN;jK*Q8kz+?H`CjVvtiIB+A<;s#`xyK
z#TE2sJp)pIqM?IqP~YYRmljiGRc9D*oYwYo0ly3yKF1XfRd9pm`)EcNcPJlEFTCpk
z-X%Pt#4d_!<3+dV^dxWiF2V;kZ>AZ|eBr&z)NZUF^z!$I&~;SxnE?3ZH%c8E2s7P-
zV8^Fa`^jJ!bc(LL8UlrKX!86}*k36ON*<;GJ;GssG6jDS0i8-0g0gF<*LU<&5gOe+
z0^YnH4kMnWDr>{wvqCg+WGHmM9Ri1%(#)@eA+Zo`oE`+Lq61-62U@Zx0B)70)Y<-U
zCCLwN_M#exeBtA2bl_tjDB(nJyy^{$e)fVUPm=FSPblg^Q%86}*6;4%(wP4I+zn=h
z(D652;nC|Zu&o8{+wKgDiqK2bonTmu4Wc`e{~iO1m!rP3a$!Vj4kY)azm8<Xf+{p{
zVHPwtGQnv8rJv4#Rki7><>}DMiv|x*gS2z0P_7ZJU7rGf22;oJ$*|~J5;(V_mfP>Z
zhN6@<EfHG9Ccu)8baPKUJW-C`m>ma4Qe(lT7qvec12e1AxrNc-YoqQ1qTv0XZo`Gz
z<g+3Yc6iaw3AbQEJvzIQV#Y_pJ2_N&-feiTb`&J<p&Napp=~0)I41_`mWhSJ-_qEQ
zaWF8FdQ6XpBjE`!d^>&DG!cqkBV*JZ_#`L^`mCnV2FY;p7n=WC3RHJVg$ke2tQu)>
z<_EggI~_jGq?+?GU`WMGcxyj(?ve$E<Eib8Y;Y-&18sNGlWlUL?G5TY(SQb_HW;&!
zW;S+$h>KKwq%$1yae*IK(v*6x@WB~sG1v_{I=e&RPpE7S4~RQK*}XmCXeRwW&kL46
z<_+7vr#HI!z^p`SInx(<m-2(~-Bk4je>i`e(k2JMqDKN@*O&Cd^Fc7`PjY@U7%BvY
zz{bz%*Jnea%^x)W^)QI>2#1o(=>4Z6V8@U2e4j#)dyqQ6N5Oj{pio)rvML;2N)Ce$
zhf?6FP-yoQ?OYiGU%FDj=wO(4HV76pr8R2;p?esW92)=$*ZpBtb6T+758MmWtJ8d;
zL9`FN(t)~s=M8hpP={Gwa5dQz>c2#t4|_m(Rk}Xk9c~$J@J>Ja@+Vh#@+lg#!UYmN
zsP+hF*!qVP+-XEZzOcauA#~+U0}frwg*q+hiS0SCw=jJ*EgQN;XTdWa$@RNTI9HZ-
zeUJf@Qqy5nPpWt{4Qf`Q-xj7qLT(C79Y7mTCqtz=^vd!i_{EDNhTnlP=M&*@LkiiD
z07HUl{rGtBy%q<xThWSbv9PBoRhbq8^<$%9M+e%uCkpD6rRuY9!`_rg*!B`NICcwi
z+fs>+6z?4goA*%66SrZ}pEPQC6r6O6hN^3+QH>aQ=T|D+Cl+ow$H8wOQg+pN7=Dm?
z^-O@}NmS+iMCf1o4)pnkF11gBo42UQlw?>No&ryPMYEfxLft><qfu#4Gawx{tfGp~
zWWdj7sN~R0aCXjuVoRxB^=v5d1C4n(2TEtsra8G#yrKa=?j^4-Ht>t1K{K4-yJF6e
zxRWNdc7X*qsl`NBXdUhbr8iOFbMD}DiT)Vv0atyoOYgaA4IQlS1;c-()kD0YftwFZ
zTS@`7e4+PAy4cqbp30^bANzw_r2u&O5S{2A2;s@}&ig@dxO6bo{gz&TF$8W$QRviA
z_^5Cg?A%IqTZBXBtMu2K5zry15PZ9cIvk|)wP?`L2$+==4zG5ktvkZt^-9!#dMH%Q
z3W1_sY0R-;*k6fWUl0T@8-XzBRr3Ei0IJra@Rj~B(T#SG@Pi`1`9k@|bbYN4ObVex
zW4+<@H80rMoXTzYge8yA%xNAJ<qo+WXxz7MFtscV`oI;!QeB{9Pug<C8R}G_RtudV
zz_7u^{`A#p0}9n9*X6k|)RR6MmIGJ*$cE|-Y2X)G@JA3ikIRI2u4cg67F2gzI=oPX
z5~rqtb4)61=s-KZOM$*+Y2d76cqBCm3cW<fj@*IotI)88iO|<bfWQG{`zap2s7;HO
z$3cBBsxUkjj-88vtqrNw`e=9}m`;p~f^AoCL$j7tb6X^&7on~1-+~_XXv=)^=obm)
z5@`MS+t9Uq6qMXZHC~8@JAabT_!#&jBo?ZzqnS<Op!l!!+sJtEb4`HPR?>)?iLmD<
z%I$Lpj9mKQ!z5^5IT`#8(D&U_U_v6botX+3OQu22E~?rt9gf_hH{QyCwc(ktYcnls
zngt1$Xwj%_DD9U6D_2q5`nj<A3=JA=zy>E9Oj<%I)tn&Y1kHZg8MbFoqq#0HprR|d
z?x)APy1|)vN_*EGJ}=<`$9K{6ww|yolKQ^o1)~aiL&GifTyq~NdWAyY@P#CQKe)7x
z4n5-!D}SeXuLVGFk3i`B85Mde2tt3Pqy2*6SPl(c5CWqrhl1Y`D%vv)Hl)zO55l2k
z*$C+O9W8yK5LDkw6+fY;e~W-UHR#OFa5(KjvnPhZpMQlyyJqym&Jg%Ej3V9*h6Oi+
z;K$C?ZdV|LmZvf^17J|9KOFB)*@yk0T4g#j-xqr3`oN7>sn=<5sPrT?TJ8l)+$mtV
zCzSo&1Ac5sN7uQ-JHa&J4L7KN%@v+`o|3k?fKOpsKg}7=M>#>aj<oz+8^o5SQXd#l
zJT(`_^`I$7a=@)JWh}^swK-WZwLf+GF%yc`CjVs_u+NiDyq*sI&ZWV-4JcrJDl`qE
z-Q!Zg`D!xsZAss4O#;87G;-=4_$nq59_>JF_9VcuGIVuTJoHP6gV$f8%)_yeQia}K
z5Cdb4XbA34$)}@W;Zrnh`E4lbN%6xX;nulZ(7hXZwxHJ%=$lQE(7McRsQClc>k|cy
z5~<nzXqZwW2Eq^0JMCg&bvzw>I}Sz^jfat2>GJalF!d^39GeK?!FQnLTI$d+3A}%$
zp2LzM(<KF(FC(v-sZi!es@x|Ha<b{AdFgQR@eEk9pAL1)gp2XC^Svx6RU#WU@1j@Q
z<iHoV=+lY0uq@nw0~=|2QyXMopv$A2V6%@i^jl3s>$!mMS*kPG6%M+%f&V8owWd2n
zo}d=5c)-z2D)f;jeEyghL>-`+-MnGX9U3^(2WCI&3r%)Y_x64e9z~_5_`{!%1i)Wk
z(W>VIVaZ?g@|!`>CMX!fzM$*|A#msqS~V;b2787<)8*t}I~=Z`rmg)WpqxR0?-zoG
zM=7%n1-~5uyPT-s;BeS~I1I)-OGOujLMva&7!m?5=YnBR11hsF2z*26y)l8%`g#C-
z{~X0__lKbo^z?K;crnr!26d#?-}u0XWvT5<Z#a_T1#P>N?-5UERfz^J@PH;c?r^>z
zJ^7;>^mvLMUFHh09^^611!n%?3^yB4<u9CIcMu(Y(*`eHH6XYJZP=O%{R&gfsX1^V
zDjSZyNd3RfqB7+AK_&#IWWc5#^!?#<c&RdtS&#;yxv5aOKmG7y3jFmHy|pYE=6O=J
zVM$Q`+#R^ofUbU#2-AXS%D4n5cQqc0wxsX3#=)i{)P8C#)QX9Li!aj7@1mhs8LBZW
z3jR#K4V!vW-@}p6q6$s><Q616O$#Q|yf%^W!ZrGI@NIbYu_zdMoOVu(hEb2kK-vlV
zaC9s*35$adzo$=n#KV&w2~cG@b!nCe1Fq1tDR&_EktFc?hR(H3hJa|woSXt13#G!4
zO?0ba8a(?e9q*S8)6=Q*j0|`oA`=#^qOH}l;Nx#;ce8BhaGJ(+&4EjoDY0KJ)QqCa
z!wh&Kk!p{&!Hi^DJjMyqk|=YeGmMU>!9!iZ`4-*j;|gof)5jg$V899L(#RcN*h$Y-
z@_>P#(STr2_+|<nOQu$@c){>rs8R!O7_^ysKjH&>rqi7`8rjtsqW9DMihj^>4pm8|
zdfoh?<vv<pDge@^(WV<zzgZx(Sxe>JgJ97sRAE0Ia|s5Q+d=SSTPnLh5VE__wvz$y
zX(w8K(I2+;pc>JB@bn-$k?9LJCs0{GdhH`0a4Ah4HhIJH`ZVf<7vy%OBT=5<J)U0h
zr}fJ`pl~fZanv13^`eeRZZPlzs{bg(f9DFrJJ6N{7r6Bvttw9+9&m>5dsE+BCon#v
zc286LD>iukEn4#^l{sX<p#gN&hm5as;oDABFE<C~uBPFwsY6OOe6)<Ro72MNESR*6
zMzo@z(lepxI*RT<@4M3BZ5gnmFLel`xkuAs&YKiknTGtC26g7s&F3lANQLAb)O0A#
zEkngGrNCG7X?$C1??o>jN`^si(eiqfl9mL$c2Jj*RH+_qtVI*&(6i3T@MJ4`Y(3p_
zO97wG6tt6OyQRX@y{XGqTI7`m&-S1LTPV~e9ZtSTNo(n|6mn^v0guk7{x_**jZCOF
zh5S#^ydqgJ<W+ieE4`XUxzA;TF`FJcM^Bf`0hfVPb_>l(r9Jg>;n%mx>j<6mHXyJK
zEt^Nb{6gi!ZP2eXZCFIcA5`=aCm7MiZlTkNg-*wQrLRJq!Tkj~KZ~lKpky}}Xwi^d
zCQ$dC<dZ=CE4o5(9~!ZQikzV-UT#pi0WBRvtvAw<zv%67cW`e>rzTOKtyKF4U5fC4
zBhS;M@ibv0wYo&F_<2I>r|In>^zJ8g{5YLXrXSqBVBI-S_+lC*wIH7W8gSeLF3+Ri
z+R(008uptz7>ntNUKCS`>fd&wjdXAneOa4QoT%7QSBRNQ13J^zQZ(hZ3$)x$eJ0Y5
z=HwJYQJ0;e`+B-Lh6XjJm4Wp5WhaQ(NQ=i&gXih1LKG2cgCV<U{=0OfD{XnqF5B3W
zZM6Q8LRQdQBdKUJYFn7TiOYp;2k6>DT0MjoHlm`1=*PGm2s=zumeRW;X-i8QQJUIj
zXTzzp^wMVfcn1C6n-0~Zo#E6uF$+>oQuEJg?lk)7Wt#RhJyDoWre#8fU#agl8a$6$
z45N%TG`<S`<VUHo8F1rAdhS~aJVis?Gr_GE9q&fVKcLCmsnB24#y1NZ)uM&HDf(Ud
zeLH=6fkwM$LwIG{(21U!NFT1D%pd5<B<l4@4t(+~4SAIg&ZKf*(w4I{KZAM~%Z0rS
z>3m;W_bwIRKplUiDhYHl*Z|)rD6kWKH-^eAqNjI}_c@xEPKOHF;KWljx-+GYChz&=
zzKv%5OxbZ1<Ld+$D^k5?wDuJmJDGYdrPaI0>nt6Nr!Tyn;X+wz(10Sl(dkiiXEt^J
zoHD+r8|TR>nMU}!fL~d1dzwmhq!mM`!8B_A2@TmwxyR`9D|9r4GJITNZ7C}A6va2A
zwN1$LQEHpx0wb@}lLu+R8p?f_h7F`w+EA^k^h_w#PIU&S3siG2onA?SGicLb`k@`o
zuSNZe&?Fn(yy*nJPg09*^weUSKbf-o(UCT^z7}09M$fp>udz1R{wr<XOJ3`!?_8?;
zCZ+bFMy=?jC#gh9TH;N|k`4Ie3e`SA!*|f6<y7bc`e-c8dWA-|rIYojNCo;Ol-_ls
z&*E}n*9Cg~IIY`BV^>p$59zJRwEHz`(38%!q+NAsQ$@N_h-!J#p|l)$?H0ZGJ9Rut
zbHAqB>*$R|RQ^5k9!GwIsc{ebq&1a!mdtZho-LCD<4e)Wn)GuU8ul_39ZhFvlFz4f
zb}N-ROncAKf*A6^rKz^usv&f!EG5;Z_!bn`lP0}Rm8a0)k7)NA+P0HEIYyn%(b*{K
zkVS)h4cJtadR3;rPt%UpG_EHN9ZHE4Xyym>!zbjofqZsT`Z4<IcWQN$_9c_Iiw)`o
zQT-D1cxAd)mu5Go?2gpu6?$(Nt)ECUXVQR$<h+_b`H~X9qh`mc%da%#FRB+yz8SRG
z)d?yF(&!>|xE%dlo&Ky(o0`$Y_T<x(KJ8C&!>Qo}>hul`nM=<tp^~d<?<VT`H67Sb
z<xfz%U&#F;z4#|J{DYo2LcZV7(T%j_Q`$3+woN6cu~c{vW%i(B?Px_~I{g$~evBHF
zpq0T?&V#OI+F)utExAVB{-C2LY5n)qe<uy!KyNOmP4g*xCiR?5v7_m&!PKTV1$Cw(
zttqH6b*w{^s!~Q->R6QALTJ7hy<wx;X$G{6qi1i>jEl787pnLJO+7$WcGK>!X#N-U
z;tJ}qm|D)GsqfLsx5;B1bsRyr22tNvsB{ndu><XDO>>{4HP6!e+H|`*6@HwimZ2-f
zXhZ~M1kw&~dexPl&&`F>=~U$oRga;*H)-yl6m_0@{7MUcraEUS^)h`CNs;k1D}&}c
z8Q|hgYlCTMVJcplHate9Yto9k^g|<R(t=8~r#W4zbZ?qEfX=;6kB+4VlW6F4>h=Nk
z`-sXfp@0>%b{!4cOy{@L*l+3J_f+Q?_5P8*I!imw)0IDI|4lj+LsRci?{qS9XqSr(
zp7f$q{!}THmOVn3i&K>{)Vd;#uR`N$(mS=O|I_qBBMNComs-+W?Wkf$+SHYvdWk;m
zL!SMq-C$b!IvvABUL$QOW65O#g-j;5X_PjDPQ6bn=TMK2C~P5ZUqUZ@MrT)0r!}<i
zb1J)$MsK0rTdDUBDr`4viw$mlPUBY7U!T$Yi|Lz>>4`ZsdnVPNPID&H)bVt33>m|z
z`B2(CfSmi%yk3;ijXv*071~ouYnuB!jcH0%8d9aF$+-?i)FSWd^kijfT9IayrER6i
zr#QV>n7$9E(jl}ifXevNUQg=aMlQ}|f8lP7&Z2th6qZ8CiF7TF&PCJZNQ%BeZr7;7
zpVZ|N%{@<Nf2T)(rSWIz@@Z;uioQQVjgHZ&!_@mA*}kWBd#T%Z6uO(ve@$z5&|BN+
zrLU;@7OK06p4>onzM$sosK*+bu!>f$pkJ1e_h;04DSfwuy4oFCYQX8`G=CMnvzAVO
zK@&F8x-HaaE4AN2#dp!=-Lz>BwcJmE2WjD9YI%&z@4ELX1CHY3hE5yp&(MamRPuKk
za*lquK;D<B<DWF+D($^aS8tO0Z7Lc~Rb%PNc&d%J;}VVPNmMF@eA6f<osMVH;%w@l
zOBHN3h;*V)T&Rs3-EpUdo>bYJ4*5_kKl;_5+To+60&ORQs7?rd9!j3!G$?}h7NU^C
z)U^n$EJ_!PQK1sltR#&oMT;M$?@H4zWhlBVrIjO>3U(E3E){LAk5PtQ{Npw_Ux^M^
zrZrV)dR6LHjjC0rEW5omY*4r+JzIk+SEK3pBUNlgDpTjjDY7E9uRy2EQO~mUTWNap
zQOYbyUzDKQ#VM{R%_>4I3R8L^`Zj{z2&cwj<R40Z1=Fq|`Z$or22c-wYT-w<eW|(+
zRq&?Az3e<~k9*o`dr%{H>f%O&U1_EZt#zi;PLyn;GIs3^1K!W2?{mo6u3@$T?`P4O
zOe$kHGQ)tA=~TvUdYS>(Q>m5RwiE+O+s#Whz|(G0k^xzF=ncE<L<1(<`6L>!Ac4x;
zeG_j$JG;m@1KzPK6KBA&SQ=s%9&5n<7#e0*GRA;kqv?IS=b{a8vAYmuz$4L=V0R?O
zfLCIvLLB{O_g1_CH52Hx-NZx#LhsOSyVgkt+_rl&*#MsuT4eWVssZcmDyJFnrCsH8
z1J>J>$}nKDop+`I6YU~14d|Ff-`bVVHej0Ft!x7t=g@My^c(})<<cs<)La9a8uXFf
zCBuO7HX97J+iJ6cxm470vcX8ZFP&^~+wM_k8+5Uo<!pm}b_vclDDFb7?8dm*V7c8f
z7aPRc1-sgymR(0z8;rL5$khg0>`u7a;F?{Qs||wOsGMD0HygCF>*;2Lp?2flZ1Aq#
z$8I+G%<gkH8+>W^wVMrg+nJ9KakD{byI5BnY_%KfYJ(<rKCU)6??P+s#=6*`nO$KQ
z8^k%&0lOv6HW+T#%Gm~G?aVFg6(<|)v-{M^25;H*cCtZJyNXUW2(U}F+2FF>QJW3E
zvRi7i!Mk>&Z8mttuD#6$4ee^!Y+%lKxXlJ$cJ^I7BhjE+cINVM)-d1)yF-Qn-`VXn
z4EWM+gJHm0yOo9kpV@t47_i80fnmVMcINW-p<(>TJi~zh{4eg9zsLOj=ASkHo+X9>
zOYN2!2CT4KZ5Xi5ZoOf^X1lL&<iRj@*zGb5Fu(r&h5-ldju{4=vNONmKMVsdT9`F1
z8wOml`_nMsFT1OT0oUxV8wT94yJ;9;_KY+PxNR3@7!Yk2V;B%?7iSm{Z;@aakZ5<u
zFd)e;*)Sl*F4Zs~%`V+AAj2-xFd)k=+c3a<mU9gQ%>T>}mvrKXPvX-j$;Hmq{yCFw
zHXGm*D8a+d(`Ey6nen#Sz{k$lW&=Mvf13>g?C`mk5M&W-vq6X*K6?_v?98Px!e#^e
z2U6M|u~A{WA~qWowJT<`L2<hhHXD?*D`m66qjsfjHZYg-vNju(v%|^_uww%i?ace;
z<L2)%f4})>&A-R|JI%k}{I|@1*ZdmHugCn_%&*hDHNSH6yD+~a^Sd*@Q}eqv3z#*`
zGG;5Yo7vFpX|^>xo6XJs=5v831<dEje7^9+f%!a|&#C$RI@zCV^LaOy0dsjUmko0{
zF_#&0`7xIz^VVFt%q7iS>dYn3TpG<K(_Bi;CDvSe&E?r#w$0_-T;|Q?-<$<=F3cG*
z=f#{IbB@fJGUv;jHFNIF8N6bj$IJHFH0RWu+zW;Q=k3lJ24JZF<9EXV^MB3XW8Rv7
z*8F?STk~%=|CNHC`hu8u^O-fD<$r(b3vS-;x2Z4adH?sPzToEl-=BKxyqjwSbKcFh
zgmvl*V&3!L))&Oo7u>wx&9=VarvC44<<0H;y=>+4-_{rO)EC57-rOSOwXH9>sV}&#
zd|umn>(pDf^8e1%=e2KtFY|8hiDlkr`}X%f?+?np{k_lo{kCs^@AH2D?Au%Cz2LU;
z|J^J4dzt!zn|Je-<A3*x{@$nlpL#8CZr{yU^!dM*H($}4dl7g4ivHfGzTjTV|97wG
z?|teE?zQ~ieMSH8O#R<|2k&m?{lR(%@9yXQL4ODD?&tkMc?a+A=lwx>2k#I2+jsZA
zmH%hox4)aIFSvK?3*vqIyPx`kd&l0~rdzl2=6&-W`+w?v`@5g|f_umQpMBr{?x()s
z-m(9u-nYO1xAG6iaXRa~KitRZ9OwN(KThX3?+^NMy1%=Xe{he}Ilg0W9;G#3-<d~m
z%_F%F`c~e24Q?J`H;=ZPTkwZ(EC25top+r2f;%o>&`0O*pRK&(IXVB^eS34y&^)`t
zJk#UvzIW$%PL6e3|1h16W4^EW@STlgz7K331Nt|o{(pNmPC*}?FNouGj_=r;$6Fu1
zvvKavbMPGZ?eG2UyZ`Mucm*-<|EqKG{{5}|-Jf~;pls#u{><C^XDe^MYiHi(f1J*G
z&aHWz&RowtOlRYmulOFOvvJHV_5X#lam=;x!*@20xzGH6;cT4y^Gy4D*~;H<XWAFs
zR{q|vuesm0^8ei{dh7Ky_uE$9JR8UHIGy>vpZOl3d28L)-_7+k1+i~`?^o8`%k?$)
zGW7*__T7JXeNDkl{k>dIm;by!h}YBQKkpCI^>lYL?+@1XbaylF57zZ`f84{_IOf%S
z=6M1S`q?-S({Vb-BXkezaXRxzin$MF-kQf*9*(nd3gRl-`*|y$|F-@?Jm)t5ZT-V>
z)x32p|8QJ2Z{5nL**~A*K|dSEocjFFxxHlnBpLHOoCp1E9LIBV9*(nd%y-ny*WG{j
zY@EA)-~N7hE&niGHE$lnD!8j?&pUip#{ICB|96hg|2xO!^Z$gLhiNNs9;Y+U!*TqC
z9P76JK|JR+%l@fK569U!`A@z1tLE*4d)2)8OqsXlbN4Wvjq^`kMQeS>{{Gy`7u;2}
z=DF5}{l9<nxO~A~MSJ<KKN0KS+{zckRkQ_nJzf6i+?r>1|J~2QyMMOw=CL_*>hqs>
z^EHC`s=>UyANK9<{j+iYS5sebpMdw@P5pzrl{ep4G2dx<IL^i?xT|Qb^KRbHf9ebR
zxO~A~MQdIm<zoLV(|_~0e8F8sd+(on`Oj|U&Es_Dk%fojY@GbJ^$*8Z-kf^#D4uy+
z*8b_Z)^l<Sdg{&npMp61?teA)=JBS2IQ#B?oBDt1)2;J5LigZ)x^-TA^$*{tTj%xO
z-MwF5bMNQinMY^-slEDwyNb4;uc!OFXXBX1>CE$R3hp!Q^P2jCIQ!0A63l%+b3f4B
zIy~rGd2>r`ZnYoovvE8N_%rRTN9X^Y<MIVJ_5bX?{XeypH}{DC&8aWwc{lf3^V-%w
zOy}I{XIR|NujS3{yLIZV@8DUlmp9MGG2az@aL>m1caF~I^^<D~Zr;sz(am?%&DY%z
z>)AN>+rIt1|I8Zw3=8whqX%&-ub*LI{drY+y`sOLe^QmXMKI6ecsS0+G0(0sx8vp+
zw)t=6AKbHX9**O5=G0iPm;b+T)x3Gdv3`cdgZ^4xKf~gFdo6E0I&VELZ@$ZCJwo^J
zosIL)zHfi;`}X&Kj=lL>`@cIIC;#hf?zh+S590N7`G2nU!*@Mh{^!{1XIT9EujS2s
zd-L|*=lwyyYTi6T_b?r&b38(4Zquz>`G@sv9P=3K!*n)|IbZ)5&c@Ntu&}<Of3U8s
zdHAlHH;>EzJ4fdW;!`sIyRH0#dz>!UFu?ksc`nw&cQ(%7Jx=%Fo^xwn<@7L}jiaAo
z@!)Rd|F8WFiwFHUo#PQY^D1of7*M)lfO!qqgSeG9U%8uG`Ml1?d2o-@na`AYbk)3l
zn68>HZnOQzz5EOd^Hsd{wY>S--@G;V6U<xlJRkF%pS(WD{(hVHf9kdTy-fYzJrnQl
z-_0}6biJEb_j$dOZ#~y8uXpC}<&1jsdoh1b$K8Aq&fRa>&9$z%1~%8m)_FH4{ch&{
zZuafnZ8q?*GxsDNubt2T=UL>x-Oua&{QS?zbv%M^{k$4;<zQViSkKnWYnIJFmH#K+
z<o`N7|4*{b|GK%nenL(DSIV2uj^m`8@5h?wRGZJT`D)I*HDBeKulUTfaq>DRC$HJh
zYrF4w{4TGbN$q&eU0$E3;kZsPKZ(NnTEOv`zT^7Ad=Jq2etTYL%jb23-EpGxnrp{1
z>++gz$17;ey(z~Tcbs&`ExY5{w&rtfKJV6fcRb(T@hTg~*>_w6I9^?AJwwm&Q?ne`
z298Jb9oGrgYw;Y{430mu-nxD;-xYK`E8cOI9j}9PoM^`@-yP@L@w09mr`z$<?X0iX
z&Ccdp*L)TnC*AQ~dh5Jfr{4Omjyd(#*|%;ltb2^s*|+ZVJMQ^g_x~NQyt959w&U8s
zdIhd^o#6P{_|{L}u>SNb>-xcZ^xs@dSZ~c=HGjW#mL0dzjz2-tI?>kaVjSn%dL?ZB
z(`}t`$E~?_n{J(S$1S`0Y+9dX>)PI260EatZXL{9b1AaUzPUBAE_LQ|=(rDH-4n2`
z2dw)8d94ksXY5<o364J(!+H+Cb<JS?sh5uH2kRNI)+x3gF}KdL`L9@K*?Oj&b)wC$
z+?;6ZTwBkRw@$Zp3vQipYgKD)v%htlZk=@NmOZa|w{GRF+j{HNTetY;66HAice4ht
z?g^OdfxOlR)_sG#)(O_v3yy1syw(raJqL3w;kaG4p7EalEL$hqTwj@AZC-P2J&VS=
z?aphut=n<O8P99dty}iHpLgrjTetZ6&;H%40n9Cwb$=lLwZYx56Y^g(Sl18MJqL4s
zty7%;EdO^CeK&J$Eps<Bp8urZ{k-Qt_4&_!{%e5z*8|r50dtvmTql?_V!buj2G(2a
zl$mp9y)~!OdTXv99B-|^$ND$qKg-rFwc|wRKiAf6w>jPSGUJYu?l|w(y?X1uz2mmt
zoO;LE|GR4da|>l%o~`=>)@9yY4_I%_Eui(*oFnV4x%IT(TDP#~eRIuVz0H4$9k<So
z+vxl!+Pb~AevghFtXpvNzI8k9IOC4nbjL||+`gO7uXXRvaq1nn_>Qyhxb=5j1DIPP
zbM~#b)+O9}-<$&Lt#xhSxK41~Pq_Q_gLPeDU57YMabC0RIML=;X#M){X0G$vf;(=<
zt^4g}|GS@b$9d0d>K(WEdCk7#8o=>YfOQ#mT*4iv;O^H6j(ZFFuOG}gwXPqmYY)dM
zcHHZ>u92*>Y~Ii7dvW}(?|!=Pe#Y~f^t|T%?x#Ml+0SbYkk@)3ueE{WzCr%$1aqbw
z*9>{BAIv$;|2D6`&2g6VnrO%EwRMeWe(#RAW-G^A>vUW1o6m*gtvTI}w~p)izdQBj
za`kuD0OoT0ch?5iNy%%P9OusZh;>5m=DzjMTJPueubYoszfS9Y>$=YIzO{+<zPT37
z>(<)edf&RA=6FA^=RL2f&ufcsUDB+}q2qnWW!U<N<C1TE#5yUC_pNJ#yzb{Ur};mg
z*WZ@^ESq1U_3O9Zw|>`o-FK{KeZ<<_@xJ4XTOY~)d3Rh+93QbRV~+RpT1u^tTbFIe
z`;K$r_=t6;^17e@gx<}s=JhvQA9wuPtdBT;caD!(%Q)V5EbRD*<8$QrNdC`z{!?#V
zejJxK$49KoYF_vATJjwqx6V#p_Z`;>c|BsC=)8W9_3^y^MeE~^U$f&Qd3A7n+_9(Q
zBi3gm|ND3IyqmwrahY*^#Btfn>k-E#Ij=_?CnEnxtn-!see0a&bwB^V!TPKDe^u6B
z&FedLd_1puj*mM&7x_PO_s@I&%a8f1cmKEPcdCF2sDKKnfC{L93aEezsDKKnfC{L9
z3aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEez
zsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKn
zfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L9
z3aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEez
zsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKn
zfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L9
z3aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEez
zsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKn
zfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L9
z3aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEez
zsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKn
zfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L9
z3aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEez
zsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKn
zfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L9
z3aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEez
zsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKn
zfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L9
z3aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEez
zsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKn
zfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L9
z3aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEez
zsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKn
zfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L9
z3aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEez
zsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKn
zfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L9
z3aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEez
zsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKn
zfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L9
z3aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEez
zsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKn
zfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L9
z3aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEez
zsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKn
zfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L9
z3aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEez
zsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKn
zfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L9
z3aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEez
zsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKn
zfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L9
z3aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aEezsDKKnfC{L93aG%{
z7Z^Eo*pT{`-~MqIo6Y+F{3WOV{JOKv=4$>=+w%Y4qphBQu|r`z{Cu0|+CKl{a~=F}
V|G8ErUmP{M@4(kf)~IH){Xbmpmw*5O

literal 0
HcmV?d00001

diff --git a/Pontu/src/engine/AudioHandler.c b/Pontu/src/engine/AudioHandler.c
index a217a75..c468e41 100644
--- a/Pontu/src/engine/AudioHandler.c
+++ b/Pontu/src/engine/AudioHandler.c
@@ -2,7 +2,7 @@
 
 // A channel represents the number of SFX we can play at the same time.
 // We normally should use only 1 channel, and we add one for safety.
-#define NBCHANNELS 2
+#define NBCHANNELS 10
 
 // Local functions
 
@@ -19,7 +19,7 @@ int fadeOut(void* args) {
 	// casting args to a pointer to Mix_Music
 	Mix_Music* music = (Mix_Music*)args;
 	int ret;
-	
+
 	if(Mix_FadeOutMusic(500) == 1) { // Starting the fadeout
 		while (Mix_PlayingMusic()) {
 			; // Waiting until it's done
@@ -60,7 +60,7 @@ AudioHandler newAudioHandler(int masterVol, int volMusic, int volSFX) {
 	audioHandler.masterVol = masterVol;
 
 	fprintf(stderr,"Musics: %d\nSFX: %d\n",NB_MUSIC_DEFINED,nb_SFX);
-	
+
 	// Loading musics
 	for (size_t i = 0; i < NB_MUSIC_DEFINED; i++) {
 		audioHandler.musics[i] = Mix_LoadMUS(musicsPaths[i]);
@@ -140,13 +140,13 @@ void playMusic(EnumAudios music, AudioHandler audioHandler) {
 		fprintf(stderr,"WARNING: tried to play an arbitrary value as a music\n");
 		return;
 	}
-	
+
 	// Checking if audio has been opened.
 	if (!(audioHandler.canPlayAudio)) {
 		fprintf(stderr,"WARNING: tried to play a music with an unusable AudioHandler\n");
 		return;
 	}
-	
+
 	// If another music is playing, fading the previous one out
 	if (Mix_PlayingMusic()) {
 		// Creating the thread, passing the music as parameter
@@ -180,7 +180,7 @@ void playSFX(EnumAudios sfx, AudioHandler audioHandler) {
 		fprintf(stderr,"WARNING: tried to play an SFX with an unusable AudioHandler\n");
 		return;
 	}
-	
+
 	// Getting actual chunk
 	chunkSFX = audioHandler.sfx[sfx - NB_MUSIC_DEFINED - 1];
 	// Getting first available channel
@@ -196,4 +196,3 @@ void playSFX(EnumAudios sfx, AudioHandler audioHandler) {
 		return;
 	}
 }
-
diff --git a/Pontu/src/engine/Button.c b/Pontu/src/engine/Button.c
index 5e3d0af..273c962 100644
--- a/Pontu/src/engine/Button.c
+++ b/Pontu/src/engine/Button.c
@@ -27,12 +27,8 @@ bool drawButtonOnRenderer(SDL_Renderer* renderer, P_Button* button)
 	return true;
 }
 
-bool isHover(P_Button* button,const int x,const int y)
+bool isHover(P_Button* button)
 {
-	SDL_Point coord;
-	coord.x = x;
-	coord.y = y;
-	button->hover = SDL_PointInRect(&coord,&(button->rect));
 	return button->hover && button->drawn;
 }
 
@@ -60,3 +56,15 @@ void freeButton(P_Button * button){
 	SDL_DestroyTexture(button->texture);
 	SDL_DestroyTexture(button->hoverTexture);
 }
+
+bool isButtonEntry(P_Button * button,const int x,const int y){
+	SDL_Point coord;
+	coord.x = x;
+	coord.y = y;
+	if(isHover(button)){
+		button->hover = SDL_PointInRect(&coord,&(button->rect));
+		return false;
+	}
+	button->hover = SDL_PointInRect(&coord,&(button->rect));
+	return button->hover;
+}
diff --git a/Pontu/src/engine/GameInputProcessor.c b/Pontu/src/engine/GameInputProcessor.c
index 64006c5..73af6e5 100644
--- a/Pontu/src/engine/GameInputProcessor.c
+++ b/Pontu/src/engine/GameInputProcessor.c
@@ -81,11 +81,10 @@ InputElement proccessGameInput(GameInputProcessor *gameInputProcessor, const SDL
 		{
 			for (size_t i = 0; i<gameInputProcessor->tabButton.size; ++i) {
 				P_Button* b = &gameInputProcessor->tabButton.elems[i];
-				isHover(b, event.motion.x, event.motion.y);
+				isButtonEntry(b, event.motion.x, event.motion.y);
 			}
 		}
 	}
 
 	return createInputElementNone();
 }
-
diff --git a/Pontu/src/engine/InputProcessor.c b/Pontu/src/engine/InputProcessor.c
index 5b931b3..c970099 100644
--- a/Pontu/src/engine/InputProcessor.c
+++ b/Pontu/src/engine/InputProcessor.c
@@ -26,7 +26,7 @@ InputElement proccessInput(InputProcessor *inputProcessor)
 		case SDL_MOUSEBUTTONUP:
 		{
 			const SDL_Point mousePoint = {.x = event.button.x, .y = event.button.y};
-			
+
 			for (size_t i = 0; i<inputProcessor->tabButton.size; ++i) {
 				P_Button* b = &inputProcessor->tabButton.elems[i];
 				if (SDL_PointInRect(&mousePoint, &b->rect)) {
@@ -39,7 +39,7 @@ InputElement proccessInput(InputProcessor *inputProcessor)
 		{
 			for (size_t i = 0; i<inputProcessor->tabButton.size; ++i) {
 				P_Button* b = &inputProcessor->tabButton.elems[i];
-				isHover(b, event.motion.x, event.motion.y);
+				isButtonEntry(b, event.motion.x, event.motion.y);
 			}
 			break;
 		}
@@ -47,4 +47,3 @@ InputElement proccessInput(InputProcessor *inputProcessor)
 
 	return createInputElementNone();
 }
-
diff --git a/Pontu/src/view/MainMenu.c b/Pontu/src/view/MainMenu.c
index 1bd2f85..0423fe1 100644
--- a/Pontu/src/view/MainMenu.c
+++ b/Pontu/src/view/MainMenu.c
@@ -63,7 +63,7 @@ P_Button* drawMainMenu(SDL_Renderer* renderer,const FontHandler fontHandler, uns
 	return buttons;
 }
 
-int mainMenu(SDL_Renderer * renderer,SDL_Window * window, GeneralState * generalState,FontHandler fontHandler){
+int mainMenu(SDL_Renderer * renderer,SDL_Window * window, GeneralState * generalState,FontHandler fontHandler, AudioHandler audioHandler){
     int statut = EXIT_FAILURE;
     char* path = "../rsrc/img/Lenna.png";
     //Initialisation
@@ -92,17 +92,20 @@ int mainMenu(SDL_Renderer * renderer,SDL_Window * window, GeneralState * general
                 *generalState = GS_Quit;
                 break;
             case SDL_MOUSEBUTTONUP:
-                if(isHover(buttons,event.button.x,event.button.y))
+                if(isHover(buttons))
                     printf("Nouvelle partie\n");
-                if(isHover(&(buttons[2]),event.motion.x,event.motion.y)){
+                if(isHover(&(buttons[2]))){
                     buttons[2].onClick(&(buttons[2]));
                     break;
                 }
                 break;
             case SDL_MOUSEMOTION:
-                isHover(&(buttons[0]),event.motion.x,event.motion.y);
-                isHover(&(buttons[1]),event.motion.x,event.motion.y);
-                isHover(&(buttons[2]),event.motion.x,event.motion.y);
+                if(isButtonEntry(&(buttons[0]),event.motion.x,event.motion.y) ||
+                    isButtonEntry(&(buttons[1]),event.motion.x,event.motion.y) ||
+                    isButtonEntry(&(buttons[2]),event.motion.x,event.motion.y)){
+                    playSFX(SFX_menu_sound_effect, audioHandler);
+                    printf("True\n");
+                }
                 break;
             default:
                 break;

From d71beabbd727768b12b79a65e5bed4507b577f40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathis=20Rib=C3=A9mont?= <mathis.ribemont@etu.uca.fr>
Date: Mon, 7 Feb 2022 09:59:16 +0100
Subject: [PATCH 04/14] maj de la documentation sur isHover et IsButtonEntry

---
 Pontu/include/engine/Button.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Pontu/include/engine/Button.h b/Pontu/include/engine/Button.h
index eb728f3..4fbf738 100644
--- a/Pontu/include/engine/Button.h
+++ b/Pontu/include/engine/Button.h
@@ -54,12 +54,17 @@ bool drawButtonOnRenderer(SDL_Renderer* renderer, P_Button* button);
 /**
  * \brief Test if a point is on a button
  * \param[in]   button	the button target
- * \param[in]   x	x of the point
- * \param[in]   y	y of the point
- * \return SDL_TRUE if the point is on the button
+ * \return true if the cursor is on the button
  */
 bool isHover(P_Button* button);// dit si le bouton est survolé en donnant les coordonnées x,y
 
+/**
+ * \brief Test if the cursor has just entered the button.
+ * \param[in]   button	the button target
+ * \param[in]   x	x of the point
+ * \param[in]   y	y of the point
+ * \return true if the cursor has juste entered the button.
+ */
 bool isButtonEntry(P_Button * button,const int x,const int y);
 
 /**

From 14f93ae622eafe4f74856555380bc2f65c12a8f5 Mon Sep 17 00:00:00 2001
From: marouault <martin.rouault@etu.uca.fr>
Date: Mon, 7 Feb 2022 10:38:28 +0100
Subject: [PATCH 05/14] Modification de l'affichage des action de jeu

---
 Pontu/entryPoints/main.c                      | 16 +++--
 Pontu/include/view/BoardDrawer.h              |  5 +-
 Pontu/include/view/PiecesDrawer.h             |  5 +-
 Pontu/src/view/BoardDrawer.c                  | 36 ++++++++++-
 .../view/GameMain.c}                          | 59 ++++++-------------
 Pontu/src/view/PiecesDrawer.c                 | 17 ++++--
 6 files changed, 83 insertions(+), 55 deletions(-)
 rename Pontu/{test/oldMain__ThisCanBeGameMain.c => src/view/GameMain.c} (64%)

diff --git a/Pontu/entryPoints/main.c b/Pontu/entryPoints/main.c
index 684c118..3a72e56 100644
--- a/Pontu/entryPoints/main.c
+++ b/Pontu/entryPoints/main.c
@@ -52,15 +52,21 @@ int main(int argc, char const *argv[]) {
 				int windowH;
 
 				SDL_GetWindowSize(window, &windowW, &windowH);
+				
+				size_t nbPlayers = 0;
+				Players* players;
+				bool crashed = gameCreationMenu(renderer, &generalState, &fontHandler, windowW, windowH, &players, &nbPlayers);
+				if (crashed) {
+					fprintf(stderr,"sorry");
+					exit(-1);
+				}
+
+				gameView(&generalState, window, renderer, &fontHandler, players, nbPlayers);
 
-				gameCreationMenu(renderer, &generalState, &fontHandler, windowW, windowH);
+				endGameMenu(&generalState, window, renderer, &fontHandler, players, nbPlayers);
 				break;
 			}
 			case GS_Game: {
-				size_t nbPlayers = 0;
-				Player* players = NULL;//...;
-
-				endGameMenu(&generalState, window, renderer, &fontHandler, players, nbPlayers);
 				break;
 			}
         }
diff --git a/Pontu/include/view/BoardDrawer.h b/Pontu/include/view/BoardDrawer.h
index b57ccd0..4aaa3e8 100644
--- a/Pontu/include/view/BoardDrawer.h
+++ b/Pontu/include/view/BoardDrawer.h
@@ -11,6 +11,7 @@
 #include <SDL2/SDL.h>
 #include <stdbool.h>
 #include "model/Board.h"
+#include "model/Coord.h"
 
 /**
  * \brief Draw the board (water, islands and bridges)
@@ -23,7 +24,9 @@
  * \param water Texture for water
  * \return true I don't know what to return
  */
-bool drawBoard(SDL_Renderer* renderer, const SDL_Rect* boardRect, const Board* board, SDL_Texture* island, SDL_Texture* bridge, SDL_Texture* water);
+bool drawFullBoard(SDL_Renderer* renderer, const SDL_Rect* boardRect, const Board* board, SDL_Texture* island, SDL_Texture* bridge, SDL_Texture* water);
 
 
+void drawRemoveBridge(SDL_Renderer* renderer, const SDL_Rect* boardRect, SDL_Texture* water, const Coord* coordBridge);
+
 #endif
diff --git a/Pontu/include/view/PiecesDrawer.h b/Pontu/include/view/PiecesDrawer.h
index 3d56ab0..92b4c1f 100644
--- a/Pontu/include/view/PiecesDrawer.h
+++ b/Pontu/include/view/PiecesDrawer.h
@@ -7,4 +7,7 @@
 
 void drawPiecesPlayer(SDL_Renderer* renderer, const SDL_Rect* boardRect, const Piece arrPieces[], const size_t nbPieces, const size_t numPlayer, SDL_Texture* piece);
 
-#endif //PIECES_DRAWER_INCLUDED
\ No newline at end of file
+void drawMovePiece(SDL_Renderer* renderer, const SDL_Rect* boardRect, const Island* startMove, const Island* endMove, SDL_Texture* pieceTexture, SDL_Texture* islandTexture);
+
+#endif //PIECES_DRAWER_INCLUDED
+
diff --git a/Pontu/src/view/BoardDrawer.c b/Pontu/src/view/BoardDrawer.c
index 076b07c..2b2dac0 100644
--- a/Pontu/src/view/BoardDrawer.c
+++ b/Pontu/src/view/BoardDrawer.c
@@ -1,12 +1,44 @@
 #include "view/BoardDrawer.h"
 
 
-bool drawBoard(SDL_Renderer* renderer, const SDL_Rect* boardRect, const Board* board, SDL_Texture* island, SDL_Texture* bridge, SDL_Texture* water)
+SDL_Rect coordToRect(const SDL_Rect* boardRect, const Coord* coord) {
+	const int w = boardRect->w/9;
+	const int h = boardRect->h/9;
+	SDL_Rect r = {
+		.x = boardRect->x + w*coord->x,
+		.y = boardRect->y + h*coord->y,
+		.w = w,
+		.h = h
+	};
+
+	return r;
+}
+
+void drawRemoveBridge(SDL_Renderer* renderer, const SDL_Rect* boardRect, SDL_Texture* water, const Coord* coordBridge) {
+	const SDL_Rect destRect = coordToRect(boardRect, coordBridge);
+	SDL_RenderCopy(renderer, water, &destRect, boardRect);
+}
+
+bool drawFullBoard(SDL_Renderer* renderer, const SDL_Rect* boardRect, const Board* board, SDL_Texture* island, SDL_Texture* bridge, SDL_Texture* water)
 {
 	int h = boardRect->h / 9;
 	int w = boardRect->w / 9;
 
-	SDL_RenderCopy(renderer, water, NULL, boardRect);
+	//Water (Possible to optimize)
+	for (size_t y = 0; y < 9; ++y)
+	{
+		for (size_t x = 0; x < 9; ++x)
+		{
+			const SDL_Rect destRect = {
+				.x = boardRect->x+x*w,
+				.y = boardRect->y+y*h,
+				.w = w, 
+				.h = h,
+			}; 
+			SDL_RenderCopy(renderer, water, NULL, &destRect);
+		}
+	}
+	
 
 	//Islands
 	for (int y=0; y<9; y+=2) {
diff --git a/Pontu/test/oldMain__ThisCanBeGameMain.c b/Pontu/src/view/GameMain.c
similarity index 64%
rename from Pontu/test/oldMain__ThisCanBeGameMain.c
rename to Pontu/src/view/GameMain.c
index 1ab14fe..b8e16ba 100644
--- a/Pontu/test/oldMain__ThisCanBeGameMain.c
+++ b/Pontu/src/view/GameMain.c
@@ -1,7 +1,7 @@
 #include <SDL2/SDL.h>
 #include <stdio.h>
 #include <stdbool.h>
-#include "engine/InputProcessor.h"
+#include "engine/GameInputProcessor.h"
 #include "engine/InputElement.h"
 #include "engine/TextureHandler.h"
 #include "model/Game.h"
@@ -9,49 +9,30 @@
 #include "model/arrayCoord.h"
 #include "debug/printer.h"
 
-int main(int argc, char* argv[])
-{
-	SDL_Window* window = NULL;
-	SDL_Rect windowSize = {10, 10, 600, 600};
-	SDL_Renderer* renderer = NULL;
-
-	int statut = EXIT_FAILURE;
-
-	if(SDL_Init(SDL_INIT_VIDEO) != 0) {
-		fprintf(stderr, "Error : %s\n", SDL_GetError());
-		goto Quit;
-	}
+SDL_Rect boardRectFromWindowSize(int windowW, int windowH) {
+	SDL_Rect boardRect = {.x=windowW/10.0, .y=windowH/10, .w=windowW*8.0/10.0, .h=windowH*8.0/10.0};
 
-	window = SDL_CreateWindow("Pontu",windowSize.x, windowSize.y, windowSize.w, windowSize.h, SDL_WINDOW_SHOWN);
-	if (!window)
-	{
-		fprintf(stderr, "Error : %s\n", SDL_GetError());
-		goto Quit;   
-	}
+	return boardRect;
+}
 
-	renderer = SDL_CreateRenderer(window,-1,SDL_RENDERER_ACCELERATED);
-	if(!renderer)
-	{
-		fprintf(stderr, "Erreur : %s", SDL_GetError());
-		goto Quit;
+void gameView(GeneralState* generalState, SDL_Window* window, SDL_Renderer* renderer, Player players[], size_t nbPlayers)
+{
+	if (*generalState != GS_Game) {
+		return ;
 	}
-
-	InputProcessor inputProcessor = createInputProcessor();
+	GameInputProcessor inputProcessor = createGameInputProcessor();
 	struct array_Coord interactiveCases = array_Coord_Create();
 
-	int wBoardRect=99*3, hBoardRect=99*3;
-	SDL_Rect boardRect = {.x=windowSize.w/2 - wBoardRect/2, .y=windowSize.h/2 - hBoardRect/2, .w=wBoardRect, .h=99*3};
-	const char* pseudos[] = {"Azerty","Bépo"};
-	Game game = newGame(2, pseudos);
+	Game game = newGame(players, nbPlayers);
 	TextureHandler textureHandler = newTextureHandler(renderer);
 
 
-	bool quit = false;
-	while(!quit)
+
+	while(*generalState == GS_Game)
 	{
 		// Event handling
 		InputElement inputElement;
-		while (InputType_None != (inputElement = proccessInput(&inputProcessor, &boardRect)).type) {
+		while (InputType_None != (inputElement = proccessGameInput(&inputProcessor, &boardRect)).type) {
 
 			switch (inputElement.type)
 			{
@@ -59,7 +40,7 @@ int main(int argc, char* argv[])
 				switch (inputElement.data.uiAction)
 				{
 				case UIAction_Quit:
-					quit = true;
+					*generalState = GS_Quit;
 					break;
 				case UIAction_Validate:
 					break;
@@ -75,6 +56,8 @@ int main(int argc, char* argv[])
 				fprintf(stderr, "To (%d; %d)\n", inputElement.data.move.end.x, inputElement.data.move.end.y);
 				
 				moveOnBoard(inputElement.data.move.start, inputElement.data.move.end, &game);
+
+				drawMovePiece
 				break;
 			case InputType_ClickGame:
 				fprintf(stderr, "Clic on board (%d; %d)\n", inputElement.data.coord.x, inputElement.data.coord.y);
@@ -114,17 +97,9 @@ int main(int argc, char* argv[])
 		SDL_Delay(20);
 	}
 
-	statut = EXIT_SUCCESS;
-
 Quit:
 	freeTextureHandler(&textureHandler);
 	array_Coord_Free(&interactiveCases);
-	if(renderer != NULL) {
-		SDL_DestroyRenderer(renderer);
-	}
-	if(window != NULL) {
-		SDL_DestroyWindow(window);
-	}
 	
 	SDL_Quit();
 	return statut;
diff --git a/Pontu/src/view/PiecesDrawer.c b/Pontu/src/view/PiecesDrawer.c
index d22e2e7..494c603 100644
--- a/Pontu/src/view/PiecesDrawer.c
+++ b/Pontu/src/view/PiecesDrawer.c
@@ -3,12 +3,12 @@
 
 
 //Don't put this in model
-SDL_Rect islandToRect(const SDL_Rect* boardRect, const Island island) {
+SDL_Rect islandToRect(const SDL_Rect* boardRect, const Island* island) {
 	const int w = boardRect->w/9;
 	const int h = boardRect->h/9;
 	SDL_Rect r = {
-		.x = boardRect->x + w*(island.x*2),
-		.y = boardRect->y + h*(island.y*2),
+		.x = boardRect->x + w*(island->x*2),
+		.y = boardRect->y + h*(island->y*2),
 		.w = w,
 		.h = h
 	};
@@ -21,8 +21,17 @@ void drawPiecesPlayer(SDL_Renderer* renderer, const SDL_Rect* boardRect, const P
 	for (size_t i = 0; i < nbPieces; ++i)
 	{
 		if (arrPieces[i].idJ == numPlayer) {
-			const SDL_Rect rDest = islandToRect(boardRect, arrPieces[i].island);
+			const SDL_Rect rDest = islandToRect(boardRect, &arrPieces[i].island);
 			SDL_RenderCopy(renderer, piece, NULL, &rDest);		
 		}
 	}
 }
+
+void drawMovePiece(SDL_Renderer* renderer, const SDL_Rect* boardRect, const Island* startMove, const Island* endMove, SDL_Texture* pieceTexture, SDL_Texture* islandTexture) {
+	
+	SDL_Rect rDest = islandToRect(boardRect, startMove);
+	SDL_RenderCopy(renderer, islandTexture, NULL, &rDest);
+	
+	rDest = islandToRect(boardRect, endMove);
+	SDL_RenderCopy(renderer, pieceTexture, NULL, &rDest);	
+}

From 42636bca6e19afd23ccf250b7021d7cccdec78df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathis=20Rib=C3=A9mont?= <mathis.ribemont@etu.uca.fr>
Date: Mon, 7 Feb 2022 10:45:52 +0100
Subject: [PATCH 06/14] modification newGame

---
 Pontu/entryPoints/test.c                |  7 +++--
 Pontu/include/model/Game.h              | 41 ++++++++++++-------------
 Pontu/src/model/Game.c                  | 32 +++++++++----------
 Pontu/test/oldMain__ThisCanBeGameMain.c | 13 ++++----
 4 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/Pontu/entryPoints/test.c b/Pontu/entryPoints/test.c
index f431a15..6c7c5f4 100644
--- a/Pontu/entryPoints/test.c
+++ b/Pontu/entryPoints/test.c
@@ -10,11 +10,12 @@
 #include "../test/testConnectionMenu.c"*/
 //#include "../test/testDrawMainMenu.c
 //#include "../test/testSettingsView.c"
+#include "../test/oldMain__ThisCanBeGameMain.c"
 /*
     This file is meant to be modified (used only to called other tests functions)
 */
 
-int main(int argc, char *argv[]) {
+/*int main(int argc, char *argv[]) {
 	//testTextureLoader();
 	//testAudioHandler();
 	//testFontLoader();
@@ -22,11 +23,11 @@ int main(int argc, char *argv[]) {
 	//testTextInput();
 	//testButtonTextureLoader();
 	//testConnectionMenu();
-	testMenuEndGame();
+	//testMenuEndGame();
 	//testGameInterface();
 	//testConnectionMenu();
 	//testDrawMainMenu();
     //testSettingsView();
 
 	return 0;
-}
+}*/
diff --git a/Pontu/include/model/Game.h b/Pontu/include/model/Game.h
index 3737dbb..0a88024 100644
--- a/Pontu/include/model/Game.h
+++ b/Pontu/include/model/Game.h
@@ -15,7 +15,7 @@
 #include "model/Coord.h"
 #include "model/arrayCoord.h"
 #include <SDL2/SDL_pixels.h>
-#include <stdbool.h> 
+#include <stdbool.h>
 
 /**
  * \enum Phase
@@ -38,7 +38,7 @@ typedef struct {
 	//TODO duree
 	Phase phase; ///< The current state of the game
 	Player arrPlayers[4]; ///< The array of all the players in this game
-	size_t nbPlayers; 
+	size_t nbPlayers;
 	Board board; ///< The board for this game
 } Game;
 
@@ -47,19 +47,19 @@ typedef struct {
  * \param[in]	nbPlayers	The number of players for this game
  * \return A struct representing the game
  */
-Game newGame(const size_t nbPlayers, const char* pseudos[]);
+Game newGame(const size_t nbPlayers, const Player player[]);
 
 
 /**
  * \brief (Should not be called outside Game.c) Used to change phase or player (or both) after an action
- * 
+ *
  * \param [in, out] game The game to mutate
  */
 void changePhaseOrPlayerTurn(Game* game);
 
 /**
  * \brief Place a piece into the board
- * 
+ *
  * \param [in, out] p The piece to place
  * \param [in] island The island where the piece is placed
  * \param [in] b The board in which the piece is placed
@@ -78,20 +78,20 @@ bool movePiece(Piece* p, const Island i, const Board* b);
 
 /**
  * \brief Test if a movement is possible for a piece to a destination island
- * 
+ *
  * \param p The piece to test
- * \param i The destination island 
+ * \param i The destination island
  * \param b The board
- * \return true if the piece p can move to the island i 
+ * \return true if the piece p can move to the island i
  */
 bool pieceCanMoveTo(const Piece* p, const Island i, const Board* b);
 
 /**
- * \brief Check if an island is empty 
- * 
+ * \brief Check if an island is empty
+ *
  * \param [in] island The island to check
  * \param [in] arrPieces the array of piece from the board
- * \param [in] nbPieces number of pieces 
+ * \param [in] nbPieces number of pieces
  * \return true if none of the pieces is on th island, false otherwise
  */
 bool isIslandEmpty(const Island island, const Piece arrPieces[], const size_t nbPieces);
@@ -107,16 +107,16 @@ bool isPieceAdjacentToIsland(const Piece p, const Island i);
 
 /**
  * \brief test if a piece is isolated
- * 
- * \param [in] piece The piece which is checked 
+ *
+ * \param [in] piece The piece which is checked
  * \param [in] board The board were the piece is
  * \return true if no bridge go from piece's island to another island, false otherwise
  */
 bool isPieceIsolated(const Piece* piece, const Board* board);
 
 /**
- * \brief test if all pieces from a player are stucked 
- * 
+ * \brief test if all pieces from a player are stucked
+ *
  * \param idJ Player id
  * \param arrPieces All pieces from board
  * \param nbPieces Number of pieces
@@ -126,10 +126,10 @@ bool areAllPlayerPiecesStucked(const size_t idJ,  const Piece arrPieces[], const
 
 /**
  * \brief Test if one piece of a player can move
- * 
+ *
  * \param playerID The player to check
  * \param board The board
- * \return true if at least one of player's piece can move 
+ * \return true if at least one of player's piece can move
  */
 bool anyOfPlayersPiecesCanMove(const size_t playerID, const Board* board);
 
@@ -154,7 +154,7 @@ Piece* getPieceFromIsland(Piece arrPieces[9], const size_t logicalSize, const Is
 
 /**
  * \brief  Handle global game action move
- * 
+ *
  * \param start Board coord were the move started
  * \param end Board coord were the move ended
  * \param game Game's state
@@ -164,7 +164,7 @@ bool moveOnBoard(const Coord start, const Coord end, Game* game);
 
 /**
  * \brief Handle global game action click
- * 
+ *
  * \param [in] coord Board coord were the click is
  * \param [in, out] game Game's state
  * \return true if an action was realised, false otherwise
@@ -181,7 +181,7 @@ bool rmBridge(Bridge bridge, Board* board);
 
 /**
  * \brief List cases that can be interacted with for movement
- * 
+ *
  * \param[in] game The game
  * \param[in] selectedCase The selected case
  * \return struct array_Coord An array of coord /!\ Care to free this array with array_Coord_Free
@@ -189,4 +189,3 @@ bool rmBridge(Bridge bridge, Board* board);
 struct array_Coord getInteractiveCases(const Game* const game, const Coord selectedCase);
 
 #endif //GAME_H
-
diff --git a/Pontu/src/model/Game.c b/Pontu/src/model/Game.c
index 7382f2e..e223827 100644
--- a/Pontu/src/model/Game.c
+++ b/Pontu/src/model/Game.c
@@ -30,7 +30,7 @@ void applySpecificRulesFor2PlayersGame(Game* g)
 	}
 }
 
-Game newGame(const size_t nbPlayers, const char* pseudos[])
+Game newGame(const size_t nbPlayers, const Player player[])
 {
 	Game g = { // In Placement phase, the last player initialized is the 1st to play
 		.currentPlayerID = nbPlayers - 1,
@@ -40,13 +40,9 @@ Game newGame(const size_t nbPlayers, const char* pseudos[])
 		.nbPlayers = nbPlayers
 	};
 
-	// red, green, blue, yellow
-	// TODO meilleures couleurs (?)
-	SDL_Color colors[4] = { { 255, 0, 0, 255 }, { 0, 255, 0, 255 }, { 0, 0, 255, 255 }, { 255, 255, 0, 255 } };
-
 	for (size_t player_i = 0; player_i < nbPlayers; player_i++)
 	{
-		g.arrPlayers[player_i] = newPlayer(pseudos[player_i], colors[player_i]);
+		g.arrPlayers[player_i] = player[player_i];
 	}
 
 	if (nbPlayers == 2)
@@ -72,8 +68,8 @@ void changePhaseOrPlayerTurn(Game* game)
 				game->currentPlayerID--;
 			}
 			break;
-		case MOVE_PIECE: 
-			game->phase = RM_BRIDGE; 
+		case MOVE_PIECE:
+			game->phase = RM_BRIDGE;
 			break;
 		case RM_BRIDGE:
 		{
@@ -93,7 +89,7 @@ void changePhaseOrPlayerTurn(Game* game)
 			} while (areAllPlayerPiecesStucked(game->currentPlayerID, game->board.arrPieces,
 											   game->board.nbPieces));
 
-			
+
 			fprintf(stderr, "Player n°%ld turn\n", game->currentPlayerID);
 			fflush(stderr);
 
@@ -103,7 +99,7 @@ void changePhaseOrPlayerTurn(Game* game)
 			}
 			break;
 		}
-		default: 
+		default:
 			break;
 	}
 }
@@ -243,7 +239,7 @@ bool anyOfPlayersPiecesCanMove(const size_t playerID, const Board* board) {
 		size_t nbNeighbors;
 		Island* neighbors = islandsAround(board->arrPieces[i].island, &nbNeighbors);
 		for (size_t n = 0; n < nbNeighbors; ++n)
-		{		
+		{
 			if (board->arrPieces[i].idJ == playerID && pieceCanMoveTo(&board->arrPieces[i], neighbors[n], board)) {
 				return true;
 			}
@@ -304,7 +300,7 @@ bool clickOnBoard(const Coord coord, Game* game)
 				}
 			}
 			break;
-		default: 
+		default:
 			break;
 	}
 
@@ -348,7 +344,7 @@ bool moveOnBoard(const Coord start, const Coord end, Game* game)
 				}
 			}
 			break;
-		default: 
+		default:
 			break;
 	}
 
@@ -385,7 +381,7 @@ struct array_Coord getInteractiveCases(const Game* const game, const Coord selec
 	case PLACEMENT: {
 		struct array_Coord retVal = array_Coord_Create();
 		array_Coord_Reserve(&retVal, 25);
-	
+
 		for (int y = 0; y<5; y+=2) {
 			for (int x = 0; x<5; x+=2) {
 				array_Coord_AddElement(&retVal, newCoord(x,y));
@@ -398,7 +394,7 @@ struct array_Coord getInteractiveCases(const Game* const game, const Coord selec
 				array_Coord_RemoveElement(&retVal, islandToCoord(&game->board.arrPieces[i].island), &coordEqual);
 			}
 		}
-		
+
 		array_Coord_FitToSize(&retVal);
 
 		return retVal;
@@ -412,7 +408,7 @@ struct array_Coord getInteractiveCases(const Game* const game, const Coord selec
 			if (game->board.arrPieces[i].idJ == game->currentPlayerID && !game->board.arrPieces[i].stuck) {
 				size_t nbIsland;
 				Island* islands = islandsAround(game->board.arrPieces[i].island, &nbIsland);
-				
+
 				if (nbIsland != 0) {
 					Coord pieceCoord = islandToCoord(&game->board.arrPieces[i].island);
 					if (!coordValid(selectedCase)) {
@@ -442,7 +438,7 @@ struct array_Coord getInteractiveCases(const Game* const game, const Coord selec
 	case RM_BRIDGE: {
 		struct array_Coord retVal = array_Coord_Create();
 		array_Coord_Reserve(&retVal, 40);
-		
+
 		for (size_t y = 0; y<5; ++y) {
 			for (size_t x = 0; x<4; ++x) {
 				if (game->board.hBridges[y][x]) {
@@ -459,7 +455,7 @@ struct array_Coord getInteractiveCases(const Game* const game, const Coord selec
 				}
 			}
 		}
-		
+
 		return retVal;
 	}
 	default:
diff --git a/Pontu/test/oldMain__ThisCanBeGameMain.c b/Pontu/test/oldMain__ThisCanBeGameMain.c
index 1ab14fe..bfa132f 100644
--- a/Pontu/test/oldMain__ThisCanBeGameMain.c
+++ b/Pontu/test/oldMain__ThisCanBeGameMain.c
@@ -26,7 +26,7 @@ int main(int argc, char* argv[])
 	if (!window)
 	{
 		fprintf(stderr, "Error : %s\n", SDL_GetError());
-		goto Quit;   
+		goto Quit;
 	}
 
 	renderer = SDL_CreateRenderer(window,-1,SDL_RENDERER_ACCELERATED);
@@ -42,6 +42,7 @@ int main(int argc, char* argv[])
 	int wBoardRect=99*3, hBoardRect=99*3;
 	SDL_Rect boardRect = {.x=windowSize.w/2 - wBoardRect/2, .y=windowSize.h/2 - hBoardRect/2, .w=wBoardRect, .h=99*3};
 	const char* pseudos[] = {"Azerty","Bépo"};
+	const Player [2];
 	Game game = newGame(2, pseudos);
 	TextureHandler textureHandler = newTextureHandler(renderer);
 
@@ -73,7 +74,7 @@ int main(int argc, char* argv[])
 				fprintf(stderr, "Move on board\n");
 				fprintf(stderr, "From (%d; %d)\n", inputElement.data.move.start.x, inputElement.data.move.start.y);
 				fprintf(stderr, "To (%d; %d)\n", inputElement.data.move.end.x, inputElement.data.move.end.y);
-				
+
 				moveOnBoard(inputElement.data.move.start, inputElement.data.move.end, &game);
 				break;
 			case InputType_ClickGame:
@@ -89,21 +90,21 @@ int main(int argc, char* argv[])
 					fprintf(stderr, "\tselected case reset\n");
 					inputProcessor.selectedCase = newCoord(-1,-1);
 				}
-				
+
 
 				break;
 			case InputType_None:
 			default:
 				break;
 			}
-			
+
 			array_Coord_Free(&interactiveCases);
 			interactiveCases = getInteractiveCases(&game, inputProcessor.selectedCase);
 			fprintf(stderr, "Interactive cases : {");
 			array_Coord_Foreach(&interactiveCases, *printCoord);
 			fprintf(stderr, "}\n");
 		}
-			
+
 		fflush(stderr);
 
 		// Drawing
@@ -125,7 +126,7 @@ Quit:
 	if(window != NULL) {
 		SDL_DestroyWindow(window);
 	}
-	
+
 	SDL_Quit();
 	return statut;
 }

From b35066dd1f4f62a0623a696161c4b83a5887ef64 Mon Sep 17 00:00:00 2001
From: marouault <martin.rouault@etu.uca.fr>
Date: Mon, 7 Feb 2022 10:46:39 +0100
Subject: [PATCH 07/14] Avanced game main

---
 Pontu/include/view/GameMain.h | 10 ++++++++++
 Pontu/src/view/GameMain.c     | 10 ++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 Pontu/include/view/GameMain.h

diff --git a/Pontu/include/view/GameMain.h b/Pontu/include/view/GameMain.h
new file mode 100644
index 0000000..c50182a
--- /dev/null
+++ b/Pontu/include/view/GameMain.h
@@ -0,0 +1,10 @@
+#ifndef GAME_MAIN_INCLUDED
+#define GAME_MAIN_INCLUDED
+
+#include "engine/GeneralState.h"
+#include <SDL2/SDL.h>
+#include "model/Player.h"
+
+void gameView(GeneralState* generalState, SDL_Window* window, SDL_Renderer* renderer, Player players[], size_t nbPlayers);
+
+#endif //GAME_MAIN_INCLUDED
diff --git a/Pontu/src/view/GameMain.c b/Pontu/src/view/GameMain.c
index b8e16ba..657afd5 100644
--- a/Pontu/src/view/GameMain.c
+++ b/Pontu/src/view/GameMain.c
@@ -1,11 +1,9 @@
-#include <SDL2/SDL.h>
+#include "view/GameMain.h"
 #include <stdio.h>
-#include <stdbool.h>
 #include "engine/GameInputProcessor.h"
 #include "engine/InputElement.h"
 #include "engine/TextureHandler.h"
 #include "model/Game.h"
-#include "view/GameDrawer.h"
 #include "model/arrayCoord.h"
 #include "debug/printer.h"
 
@@ -26,7 +24,11 @@ void gameView(GeneralState* generalState, SDL_Window* window, SDL_Renderer* rend
 	Game game = newGame(players, nbPlayers);
 	TextureHandler textureHandler = newTextureHandler(renderer);
 
+	int windowW;
+	int windowH;
 
+	SDL_GetWindowSize(window, &windowW, &windowH);
+	SDL_Rect boardRect = boardRectFromWindowSize(windowW, windowH);
 
 	while(*generalState == GS_Game)
 	{
@@ -57,7 +59,7 @@ void gameView(GeneralState* generalState, SDL_Window* window, SDL_Renderer* rend
 				
 				moveOnBoard(inputElement.data.move.start, inputElement.data.move.end, &game);
 
-				drawMovePiece
+				
 				break;
 			case InputType_ClickGame:
 				fprintf(stderr, "Clic on board (%d; %d)\n", inputElement.data.coord.x, inputElement.data.coord.y);

From 716239eebf5eb608f9e1425091546852684a35bd Mon Sep 17 00:00:00 2001
From: jathomas2 <jacques.thomas@etu.uca.fr>
Date: Mon, 7 Feb 2022 10:54:09 +0100
Subject: [PATCH 08/14] Button menu (not over) of the game interface

---
 Pontu/entryPoints/test.c           |  19 ++---
 Pontu/include/view/GameInterface.h |  39 +++++++++++
 Pontu/src/view/GameInterface.c     | 107 +++++++++++++++++++++++++++++
 Pontu/test/testGameInterface.c     |  93 +++++++++++++++++++++++++
 4 files changed, 249 insertions(+), 9 deletions(-)
 create mode 100644 Pontu/include/view/GameInterface.h
 create mode 100644 Pontu/src/view/GameInterface.c
 create mode 100644 Pontu/test/testGameInterface.c

diff --git a/Pontu/entryPoints/test.c b/Pontu/entryPoints/test.c
index f431a15..ebb94d3 100644
--- a/Pontu/entryPoints/test.c
+++ b/Pontu/entryPoints/test.c
@@ -2,13 +2,13 @@
 // #include "../test/testFontLoader.c"
 // #include "../test/testAudioHandler.c"
 // #include "../test/testGenerateurTexture.c"
-/*#include "../test/testButton.c"
-#include "../test/testTextInput.c"
-#include "../test/testConnectionMenu.c"*/
-#include "../test/testMenuEndGame.c"
-/*#include "../test/testGameInterface.c"
-#include "../test/testConnectionMenu.c"*/
-//#include "../test/testDrawMainMenu.c
+//#include "../test/testButton.c"
+//#include "../test/testTextInput.c"
+//#include "../test/testConnectionMenu.c"
+//#include "../test/testMenuEndGame.c"
+#include "../test/testGameInterface.c"
+//#include "../test/testConnectionMenu.c"
+//#include "../test/testDrawMainMenu.c"
 //#include "../test/testSettingsView.c"
 /*
     This file is meant to be modified (used only to called other tests functions)
@@ -22,8 +22,9 @@ int main(int argc, char *argv[]) {
 	//testTextInput();
 	//testButtonTextureLoader();
 	//testConnectionMenu();
-	testMenuEndGame();
-	//testGameInterface();
+	//testMenuEndGame();
+	testGameInterface();
+	//testButton();
 	//testConnectionMenu();
 	//testDrawMainMenu();
     //testSettingsView();
diff --git a/Pontu/include/view/GameInterface.h b/Pontu/include/view/GameInterface.h
new file mode 100644
index 0000000..75f3d16
--- /dev/null
+++ b/Pontu/include/view/GameInterface.h
@@ -0,0 +1,39 @@
+/**
+ * \file GameInterface.h
+ * \breif Interface of game
+ * \author Jacques Thomas
+ * \date 24/01/20222
+ */
+
+#ifndef GAME_INTERFACE_INCLUDED
+#define GAME_INTERFACE_INCLUDED
+
+#include <SDL2/SDL.h>
+#include "engine/Button.h" 
+#include <engine/FontLoader.h>
+
+
+
+//move pion
+
+//delete pion
+
+//draw menu Ponton (top left corner)
+/**
+ * \brief Draw different buttons on the game interface : menu, setting, sound, nbTurn, and timers
+ * param Renderer 
+ */
+void drawButtons(SDL_Renderer* renderer,FontHandler fontHandler);
+
+//draw setting button (top right corner)
+
+//draw sound button (top right corner)
+
+//draw nbTurn (bottom left corner)
+
+//draw timer (bottom right corner)
+
+
+
+#endif
+
diff --git a/Pontu/src/view/GameInterface.c b/Pontu/src/view/GameInterface.c
new file mode 100644
index 0000000..c36f10d
--- /dev/null
+++ b/Pontu/src/view/GameInterface.c
@@ -0,0 +1,107 @@
+#include "view/GameInterface.h"
+#include "engine/TextureLoader.h"
+#include <SDL2/SDL_ttf.h>
+#include <engine/FontLoader.h>
+
+//void action boutton
+
+void action(P_Button* buttonCaller){
+    printf("Bouton menu\n");
+    //changeButtonTexture(arg->buttonCaller,arg->texture);
+}
+
+
+void drawButtons(SDL_Renderer* renderer, FontHandler fontHandler)
+{
+	//DRAW MENU BUTTON (TOP RIGHT CORNER)
+
+    SDL_bool quit = SDL_FALSE;
+    SDL_Event event;
+
+	int sizex=20,sizey=20;
+
+    /*
+    
+    if(TTF_Init() == -1)
+    {
+        fprintf(stderr, "Erreur d'inistialisation de TTF_Init : %s\n", TTF_GetError());
+        exit(EXIT_FAILURE);
+    }
+
+
+    TTF_Font* retroFont = NULL;
+	
+	//load ttf 
+    int fontSize = 100;
+    int size = fontSize*100/88;
+    retroFont=TTF_OpenFont("rsrc/font/retro/retro.TTF", size);
+    if(!retroFont) {
+        printf("TTF_OpenFont: %s\n", TTF_GetError());
+    // handle error
+    }
+    */
+
+
+
+    
+    //FontHandler fontHandler=loadFonts();
+
+    //Menu Button's colors 
+    SDL_Color menuBorderColor= {0,0,255,255};
+    SDL_Color menuBackgroundColor = {0,255,0,255};
+
+
+    //SDL_Texture *buttonTexture = createGenericButtonTexture("Menu", NULL, 125, menuBorderColor,menuBackgroundColor,24,5,&sizex,&sizey,renderer);
+    SDL_Texture *menuButtonTexture = createGenericButtonTexture("Menu", fontHandler.fonts[FONT_retro], 125, menuBorderColor,menuBorderColor,24,5,&sizex,&sizey,renderer);
+    SDL_Texture *menuButtonHoverTexture = createGenericButtonTexture("MenuHover", fontHandler.fonts[FONT_retro], 125, menuBorderColor,menuBackgroundColor,24,5,&sizex,&sizey,renderer);
+
+    P_Button menuButton = createButton(menuButtonTexture, menuButtonHoverTexture,10,10,50,25,&action);
+
+
+    //bool drawButtonOnRenderer(SDL_Renderer* renderer, P_Button* button);
+
+	//P_Button createButton(SDL_Texture* texture, SDL_Texture* hoverTexture ,const int coordx, const int coordy, const int sizex, const int sizey, void (*onClick)(P_ButtonArg* arg));
+
+    //Create Button Texture
+    //SDL_Texture* createGenericButtonTexture(char* text, TTF_Font* font, int fontSize, SDL_Color border_color, SDL_Color background_color,int thickness, int padding, int* sizex, int* sizey, SDL_Renderer* renderer);
+
+
+    SDL_Texture* violetTexture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888,SDL_TEXTUREACCESS_TARGET,20,20);
+    SDL_SetRenderDrawColor(renderer, 150,75,200,255);
+    SDL_SetRenderTarget(renderer, violetTexture);
+    //SDL_RenderFillRect(renderer, &buttonRect);
+
+    SDL_SetRenderDrawColor(renderer,255,0,0,0);
+    SDL_SetRenderTarget(renderer, NULL);
+
+    SDL_RenderClear(renderer);
+    while(!quit)
+    {
+        while(SDL_PollEvent(&event))
+        {
+            switch(event.type)
+            {
+            case SDL_QUIT:
+                quit = SDL_TRUE;
+                break;
+            case SDL_MOUSEBUTTONUP:
+                //if(isHover(&menuButton,event.button.x,event.button.y))
+                if(isHover(&menuButton))
+                menuButton.onClick(&menuButton);
+                break;
+            case SDL_MOUSEMOTION:
+                //on vérifie à chaque tour ou est la souris, drawButtonOnRenderer choisit la bonne texture à afficher
+                //isHover(&menuButton,event.motion.x,event.motion.y);
+                isHover(&menuButton);
+                break;
+            }
+        }
+        drawButtonOnRenderer(renderer,&menuButton);
+        SDL_RenderPresent(renderer);
+
+        SDL_Delay(20);
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/Pontu/test/testGameInterface.c b/Pontu/test/testGameInterface.c
new file mode 100644
index 0000000..4effe13
--- /dev/null
+++ b/Pontu/test/testGameInterface.c
@@ -0,0 +1,93 @@
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_ttf.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <engine/FontLoader.h>
+//#include "engine/TextureLoader.h"
+//#include "view/GameInterface.h"
+
+int testGameInterface()
+{
+	
+	SDL_Window *window = NULL;
+    SDL_Renderer *renderer = NULL;
+    SDL_Texture *buttonTexture= NULL;
+    int statut = EXIT_FAILURE;
+
+    //Initialiser TTF
+    if(TTF_Init() == -1)
+    {
+        fprintf(stderr, "Erreur d'inistialisation de TTF_Init : %s\n", TTF_GetError());
+        exit(EXIT_FAILURE);
+    }
+
+    //Initialize SDL 
+    if(SDL_Init(SDL_INIT_VIDEO) != 0)
+    {
+        fprintf(stderr, "Erreur SDL_Init : %s", SDL_GetError());
+        goto Quit;
+    }
+
+     //fenetre
+    window = SDL_CreateWindow("Fenêtre", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 800,600, SDL_WINDOW_SHOWN);
+    if(window == NULL)
+    {
+        fprintf(stderr, "Erreur SDL_CreateWindow: %s\n", SDL_GetError());
+        goto Quit;
+    }
+
+    //rendu
+    renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
+    if(renderer == NULL)
+    {
+        fprintf(stderr, "Erreur SDL_CreateRenderer: %s\n", SDL_GetError());
+        goto Quit;
+    }
+
+    if(0 != SDL_SetRenderDrawColor(renderer, 255,0,0,0))  //choisi la couleur avec laquelle travailler
+    {
+        fprintf(stderr, "Erreur SDL_SetRenderDrawColor: %s\n", SDL_GetError());
+        goto Quit;
+    }
+
+    if(0 != SDL_RenderClear(renderer))  //efface le rendu en le repeignant avec la couleur choisi
+    {
+        fprintf(stderr, "Erreur SDL_SetRenderDrawColor: %s\n", SDL_GetError());
+        goto Quit;
+    }
+
+    //SDL_bool quit = SDL_FALSE;
+    SDL_Event event;
+
+    FontHandler fontHandler=loadFonts();
+
+    drawButtons(renderer,fontHandler);
+
+    SDL_RenderPresent(renderer);
+    SDL_Delay(3000);
+
+    //TTF_Quit();
+    if(!freeFonts(fontHandler))
+    {
+        fprintf(stderr,"Erreur free font : %s\n", TTF_GetError());
+    }
+
+
+    Quit:
+    /*
+    if(NULL != texture)
+        SDL_DestroyTexture(texture);
+    */
+    freeFonts(fontHandler);
+    if(NULL != renderer)
+        SDL_DestroyRenderer(renderer);
+    if(NULL != window)
+        SDL_DestroyWindow(window);
+    SDL_Quit();
+    return statut;
+    
+
+
+
+
+}
\ No newline at end of file

From 5ec95f9d67ccd22642b87989dba8f79096921910 Mon Sep 17 00:00:00 2001
From: marouault <martin.rouault@etu.uca.fr>
Date: Mon, 7 Feb 2022 11:10:48 +0100
Subject: [PATCH 09/14] It compile, GameMain updated

---
 Pontu/entryPoints/main.c    | 18 ++++++++++++------
 Pontu/src/view/GameDrawer.c |  2 +-
 Pontu/src/view/GameMain.c   | 20 ++++++++++----------
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/Pontu/entryPoints/main.c b/Pontu/entryPoints/main.c
index 9ae6ddf..dfeee84 100644
--- a/Pontu/entryPoints/main.c
+++ b/Pontu/entryPoints/main.c
@@ -4,6 +4,7 @@
 #include "view/MainMenu.h"
 #include "view/MenuEndGame.h"
 #include "view/GameCreationMenu.h"
+#include "view/GameMain.h"
 #include "engine/FontLoader.h"
 #include "model/Player.h"
 
@@ -54,15 +55,20 @@ int main(int argc, char const *argv[]) {
 
 				SDL_GetWindowSize(window, &windowW, &windowH);
 				
-				size_t nbPlayers = 0;
-				Players* players;
-				bool crashed = gameCreationMenu(renderer, &generalState, &fontHandler, windowW, windowH, &players, &nbPlayers);
-				if (crashed) {
+				size_t nbPlayers = 2;
+				SDL_Color color = {0,0,0,0};
+				Player* players = (Player*)malloc(sizeof(Player)*2);
+				players[0] = newPlayer("Bépo", color);
+				players[1] = newPlayer("Azeryty", color);
+
+				//bool crashed = gameCreationMenu(renderer, &generalState, &fontHandler, windowW, windowH, &players, &nbPlayers);
+
+			/*	if (crashed) {
 					fprintf(stderr,"sorry");
 					exit(-1);
-				}
+				}*/
 
-				gameView(&generalState, window, renderer, &fontHandler, players, nbPlayers);
+				gameView(&generalState, window, renderer, players, nbPlayers);
 
 				endGameMenu(&generalState, window, renderer, &fontHandler, players, nbPlayers);
 				break;
diff --git a/Pontu/src/view/GameDrawer.c b/Pontu/src/view/GameDrawer.c
index dbd2df4..c7c97db 100644
--- a/Pontu/src/view/GameDrawer.c
+++ b/Pontu/src/view/GameDrawer.c
@@ -16,7 +16,7 @@ bool drawGame(SDL_Renderer* renderer, const SDL_Rect* windowSize, const SDL_Rect
 	//P_Button menu = createButton(menuTexture, NULL, 10, 10, 50, 70, NULL);
 
 
-	drawBoard(renderer, boardRect, &(game->board), textureHandler->textures[TEXTURE_Island],  textureHandler->textures[TEXTURE_Bridge], textureHandler->textures[TEXTURE_Water]);
+	//drawBoard(renderer, boardRect, &(game->board), textureHandler->textures[TEXTURE_Island],  textureHandler->textures[TEXTURE_Bridge], textureHandler->textures[TEXTURE_Water]);
 	
 	
 	drawPiecesPlayer(renderer, boardRect, game->board.arrPieces, game->board.nbPieces, 0, textureHandler->textures[TEXTURE_PieceRed]);
diff --git a/Pontu/src/view/GameMain.c b/Pontu/src/view/GameMain.c
index bdcfbb3..adb8b64 100644
--- a/Pontu/src/view/GameMain.c
+++ b/Pontu/src/view/GameMain.c
@@ -7,6 +7,10 @@
 #include "model/arrayCoord.h"
 #include "debug/printer.h"
 
+#include "view/PiecesDrawer.h"
+#include "view/BoardDrawer.h"
+#include "view/GameDrawer.h"
+
 SDL_Rect boardRectFromWindowSize(int windowW, int windowH) {
 	SDL_Rect boardRect = {.x=windowW/10.0, .y=windowH/10, .w=windowW*8.0/10.0, .h=windowH*8.0/10.0};
 
@@ -21,7 +25,7 @@ void gameView(GeneralState* generalState, SDL_Window* window, SDL_Renderer* rend
 	GameInputProcessor inputProcessor = createGameInputProcessor();
 	struct array_Coord interactiveCases = array_Coord_Create();
 
-	Game game = newGame(players, nbPlayers);
+	Game game = newGame(nbPlayers, players);
 	TextureHandler textureHandler = newTextureHandler(renderer);
 
 	int windowW;
@@ -30,6 +34,11 @@ void gameView(GeneralState* generalState, SDL_Window* window, SDL_Renderer* rend
 	SDL_GetWindowSize(window, &windowW, &windowH);
 	SDL_Rect boardRect = boardRectFromWindowSize(windowW, windowH);
 
+
+	drawFullBoard(renderer, &boardRect, &game.board, textureHandler.textures[TEXTURE_Island], textureHandler.textures[TEXTURE_Bridge], textureHandler.textures[TEXTURE_Water]);
+	SDL_RenderPresent(renderer);
+
+
 	while(*generalState == GS_Game)
 	{
 		// Event handling
@@ -89,20 +98,11 @@ void gameView(GeneralState* generalState, SDL_Window* window, SDL_Renderer* rend
 			fprintf(stderr, "}\n");
 		}
 
-		fflush(stderr);
-
-		// Drawing
-		drawGame(renderer, &windowSize, &boardRect, &game, &textureHandler);
-
-		SDL_RenderPresent(renderer);
-
 		SDL_Delay(20);
 	}
 
-Quit:
 	freeTextureHandler(&textureHandler);
 	array_Coord_Free(&interactiveCases);
 	
 	SDL_Quit();
-	return statut;
 }

From b0a85ac7d1093b893ee730aea7965fc9df037860 Mon Sep 17 00:00:00 2001
From: jathomas2 <jacques.thomas@etu.uca.fr>
Date: Mon, 7 Feb 2022 11:23:10 +0100
Subject: [PATCH 10/14] Draw setting and sound button on the game interface
 (top rigth corner)

---
 Pontu/entryPoints/test.c       |  9 ++++-----
 Pontu/src/view/GameInterface.c | 14 +++++++++++++-
 Pontu/test/testGameInterface.c |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Pontu/entryPoints/test.c b/Pontu/entryPoints/test.c
index a3ab7bb..d9a26d9 100644
--- a/Pontu/entryPoints/test.c
+++ b/Pontu/entryPoints/test.c
@@ -10,12 +10,12 @@
 //#include "../test/testConnectionMenu.c"
 //#include "../test/testDrawMainMenu.c"
 //#include "../test/testSettingsView.c"
-#include "../test/oldMain__ThisCanBeGameMain.c"
+//#include "../test/oldMain__ThisCanBeGameMain.c"
 /*
     This file is meant to be modified (used only to called other tests functions)
 */
 
-/*int main(int argc, char *argv[]) {
+int main(int argc, char *argv[]) {
 	//testTextureLoader();
 	//testAudioHandler();
 	//testFontLoader();
@@ -24,12 +24,11 @@
 	//testButtonTextureLoader();
 	//testConnectionMenu();
 	//testMenuEndGame();
-	testGameInterface();
 	//testButton();
-	//testGameInterface();
+	testGameInterface();
 	//testConnectionMenu();
 	//testDrawMainMenu();
     //testSettingsView();
 
 	return 0;
-}*/
+}
diff --git a/Pontu/src/view/GameInterface.c b/Pontu/src/view/GameInterface.c
index c36f10d..c984da4 100644
--- a/Pontu/src/view/GameInterface.c
+++ b/Pontu/src/view/GameInterface.c
@@ -2,6 +2,7 @@
 #include "engine/TextureLoader.h"
 #include <SDL2/SDL_ttf.h>
 #include <engine/FontLoader.h>
+#include <engine/TextLabel.h>
 
 //void action boutton
 
@@ -50,12 +51,18 @@ void drawButtons(SDL_Renderer* renderer, FontHandler fontHandler)
     SDL_Color menuBorderColor= {0,0,255,255};
     SDL_Color menuBackgroundColor = {0,255,0,255};
 
+    //Postion text label
+    //SDL_Point pos 
+
 
     //SDL_Texture *buttonTexture = createGenericButtonTexture("Menu", NULL, 125, menuBorderColor,menuBackgroundColor,24,5,&sizex,&sizey,renderer);
     SDL_Texture *menuButtonTexture = createGenericButtonTexture("Menu", fontHandler.fonts[FONT_retro], 125, menuBorderColor,menuBorderColor,24,5,&sizex,&sizey,renderer);
     SDL_Texture *menuButtonHoverTexture = createGenericButtonTexture("MenuHover", fontHandler.fonts[FONT_retro], 125, menuBorderColor,menuBackgroundColor,24,5,&sizex,&sizey,renderer);
 
-    P_Button menuButton = createButton(menuButtonTexture, menuButtonHoverTexture,10,10,50,25,&action);
+    P_Button menuButton = createButton(menuButtonTexture, menuButtonHoverTexture,20,20,100,50,&action); //top left corner (rectangle)
+    P_Button settingButton = createButton(menuButtonTexture, menuButtonHoverTexture, 750,10,50,50,&action); //top right corner (square or circle)
+    P_Button soundButton = createButton(menuButtonTexture, menuButtonHoverTexture, 825,10,50,50,&action); //top right cornre (square or circle)
+    //TextLabel nbTurn = createTextLabel("Turn",)
 
 
     //bool drawButtonOnRenderer(SDL_Renderer* renderer, P_Button* button);
@@ -75,6 +82,7 @@ void drawButtons(SDL_Renderer* renderer, FontHandler fontHandler)
     SDL_SetRenderTarget(renderer, NULL);
 
     SDL_RenderClear(renderer);
+    
     while(!quit)
     {
         while(SDL_PollEvent(&event))
@@ -96,7 +104,10 @@ void drawButtons(SDL_Renderer* renderer, FontHandler fontHandler)
                 break;
             }
         }
+
         drawButtonOnRenderer(renderer,&menuButton);
+        drawButtonOnRenderer(renderer,&settingButton);
+        drawButtonOnRenderer(renderer,&soundButton);
         SDL_RenderPresent(renderer);
 
         SDL_Delay(20);
@@ -104,4 +115,5 @@ void drawButtons(SDL_Renderer* renderer, FontHandler fontHandler)
 
 
 
+
 }
\ No newline at end of file
diff --git a/Pontu/test/testGameInterface.c b/Pontu/test/testGameInterface.c
index 4effe13..63df541 100644
--- a/Pontu/test/testGameInterface.c
+++ b/Pontu/test/testGameInterface.c
@@ -29,7 +29,7 @@ int testGameInterface()
     }
 
      //fenetre
-    window = SDL_CreateWindow("Fenêtre", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 800,600, SDL_WINDOW_SHOWN);
+    window = SDL_CreateWindow("Fenêtre", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 900,900, SDL_WINDOW_SHOWN);
     if(window == NULL)
     {
         fprintf(stderr, "Erreur SDL_CreateWindow: %s\n", SDL_GetError());

From 167786f1fca4259ac607c9df070993362c6b10a4 Mon Sep 17 00:00:00 2001
From: marouault <martin.rouault@etu.uca.fr>
Date: Mon, 7 Feb 2022 11:39:36 +0100
Subject: [PATCH 11/14] Modify main page and game main

---
 Pontu/entryPoints/test.c      |  2 +-
 Pontu/include/view/MainMenu.h |  2 +-
 Pontu/src/view/GameMain.c     |  7 ++++++-
 Pontu/src/view/MainMenu.c     | 23 +++++++++++++++--------
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Pontu/entryPoints/test.c b/Pontu/entryPoints/test.c
index a3ab7bb..a3833c6 100644
--- a/Pontu/entryPoints/test.c
+++ b/Pontu/entryPoints/test.c
@@ -10,7 +10,7 @@
 //#include "../test/testConnectionMenu.c"
 //#include "../test/testDrawMainMenu.c"
 //#include "../test/testSettingsView.c"
-#include "../test/oldMain__ThisCanBeGameMain.c"
+//#include "../test/oldMain__ThisCanBeGameMain.c"
 /*
     This file is meant to be modified (used only to called other tests functions)
 */
diff --git a/Pontu/include/view/MainMenu.h b/Pontu/include/view/MainMenu.h
index af1e5e8..cfd9e84 100644
--- a/Pontu/include/view/MainMenu.h
+++ b/Pontu/include/view/MainMenu.h
@@ -9,7 +9,7 @@
 #include "engine/GeneralState.h"
 #include "engine/AudioHandler.h"
 
-P_Button* drawMainMenu(SDL_Renderer* renderer,const FontHandler fontHandler, unsigned int* nb, const SDL_Rect* windowSize);
+P_Button* drawMainMenu(SDL_Renderer* renderer,const FontHandler fontHandler, unsigned int* nb, const SDL_Rect* windowSize, GeneralState* generalState);
 
 int mainMenu(SDL_Renderer * renderer,SDL_Window * window, GeneralState * generalState,FontHandler fontHandler, AudioHandler audioHandler);
 
diff --git a/Pontu/src/view/GameMain.c b/Pontu/src/view/GameMain.c
index adb8b64..5b08067 100644
--- a/Pontu/src/view/GameMain.c
+++ b/Pontu/src/view/GameMain.c
@@ -34,8 +34,13 @@ void gameView(GeneralState* generalState, SDL_Window* window, SDL_Renderer* rend
 	SDL_GetWindowSize(window, &windowW, &windowH);
 	SDL_Rect boardRect = boardRectFromWindowSize(windowW, windowH);
 
-
+	//Draw 
 	drawFullBoard(renderer, &boardRect, &game.board, textureHandler.textures[TEXTURE_Island], textureHandler.textures[TEXTURE_Bridge], textureHandler.textures[TEXTURE_Water]);
+	for (int iPlayer=0; iPlayer<nbPlayers; ++iPlayer) {
+		drawPiecesPlayer(renderer, &boardRect, game.board.arrPieces, game.board.nbPieces, iPlayer, textureHandler.textures[TEXTURE_PieceRed]);
+		//SDL_Renderer* renderer, const SDL_Rect* boardRect, const Piece arrPieces[], const size_t nbPieces, const size_t numPlayer,  SDL_Texture* piece
+	}
+	
 	SDL_RenderPresent(renderer);
 
 
diff --git a/Pontu/src/view/MainMenu.c b/Pontu/src/view/MainMenu.c
index 0423fe1..4a2ced1 100644
--- a/Pontu/src/view/MainMenu.c
+++ b/Pontu/src/view/MainMenu.c
@@ -11,7 +11,11 @@ void quit(P_Button* buttonCaller) {
     *((GeneralState*)(buttonCaller->arg)) = GS_Quit;
 }
 
-P_Button* drawMainMenu(SDL_Renderer* renderer,const FontHandler fontHandler, unsigned int* nb, const SDL_Rect* windowSize)
+void generalStateToNewGame(P_Button* buttonCaller) {
+    *((GeneralState*)(buttonCaller->arg)) = GS_GameCreationMenu;
+}
+
+P_Button* drawMainMenu(SDL_Renderer* renderer,const FontHandler fontHandler, unsigned int* nb, const SDL_Rect* windowSize, GeneralState* generalState)
 {
     P_Button* buttons = (P_Button*)malloc(sizeof(P_Button)*3);
     *nb = 0;
@@ -27,7 +31,7 @@ P_Button* drawMainMenu(SDL_Renderer* renderer,const FontHandler fontHandler, uns
     *nb = 3;
     buttons = (P_Button*)malloc(sizeof(P_Button)*(*nb));
 
-    buttons[0] = createButton(NULL,NULL,20, 20, 20, 20, NULL);
+    buttons[0] = createButton(NULL,NULL,20, 20, 20, 20, generalStateToNewGame);
 
     SDL_Texture* newGameButtonTexture = createGenericButtonTexture("Nouvelle Partie",font,fontSize,darkBlue,lightBlue,5, 10,&(buttons[0].rect.w),&(buttons[0].rect.h),renderer);
     SDL_Texture* newGameButtonTextureHover = createGenericButtonTexture("Nouvelle Partie",font,fontSize,lightBlue,darkBlue,5, 10,NULL,NULL,renderer);
@@ -36,6 +40,7 @@ P_Button* drawMainMenu(SDL_Renderer* renderer,const FontHandler fontHandler, uns
     buttons[0].hoverTexture = newGameButtonTextureHover;
 
     buttons[0].rect.x = (windowSize->w/2)-(buttons[0].rect.w/2);
+    buttons[0].arg = generalState;
 
     buttons[1] = createButton(NULL,NULL,20, buttons[0].rect.y+buttons[0].rect.h+20, 20, 20, NULL);
 
@@ -54,6 +59,7 @@ P_Button* drawMainMenu(SDL_Renderer* renderer,const FontHandler fontHandler, uns
     buttons[2].texture = quitButtonTexture;
     buttons[2].hoverTexture = quitButtonTextureHover;
     buttons[2].rect.x = (windowSize->w/2)-(buttons[2].rect.w/2);
+    buttons[2].arg = generalState;
 
 
     SDL_SetRenderTarget(renderer,NULL);
@@ -65,7 +71,6 @@ P_Button* drawMainMenu(SDL_Renderer* renderer,const FontHandler fontHandler, uns
 
 int mainMenu(SDL_Renderer * renderer,SDL_Window * window, GeneralState * generalState,FontHandler fontHandler, AudioHandler audioHandler){
     int statut = EXIT_FAILURE;
-    char* path = "../rsrc/img/Lenna.png";
     //Initialisation
 
     P_Button* buttons = NULL;
@@ -76,13 +81,13 @@ int mainMenu(SDL_Renderer * renderer,SDL_Window * window, GeneralState * general
 
     SDL_Rect rect = {.x = 0, .y = 0, .w = 0, .h = 0};
     SDL_GetWindowSize(window,&(rect.w),&(rect.h));
-    if(!(buttons = drawMainMenu(renderer,fontHandler,&nb,&rect))){
+    if(!(buttons = drawMainMenu(renderer,fontHandler,&nb,&rect, generalState))){
         fprintf(stderr, "Le menu principale ne s'est pas déssiné correctement\n");
         return statut;
     }
     SDL_Event event;
-    buttons[2].arg = generalState;
-    while(*generalState != GS_Quit)
+
+    while(*generalState == GS_MainMenu)
     {
         while(SDL_PollEvent(&event))
         {
@@ -92,12 +97,14 @@ int mainMenu(SDL_Renderer * renderer,SDL_Window * window, GeneralState * general
                 *generalState = GS_Quit;
                 break;
             case SDL_MOUSEBUTTONUP:
-                if(isHover(buttons))
-                    printf("Nouvelle partie\n");
                 if(isHover(&(buttons[2]))){
                     buttons[2].onClick(&(buttons[2]));
                     break;
                 }
+                if(isHover(&(buttons[0]))){
+                    buttons[0].onClick(&(buttons[0]));
+                    break;
+                }
                 break;
             case SDL_MOUSEMOTION:
                 if(isButtonEntry(&(buttons[0]),event.motion.x,event.motion.y) ||

From 57dace4e2cc659b169106d2224353c63f0154203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathis=20Rib=C3=A9mont?= <mathis.ribemont@etu.uca.fr>
Date: Mon, 7 Feb 2022 11:51:32 +0100
Subject: [PATCH 12/14] free des boutons

---
 Pontu/src/view/MainMenu.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Pontu/src/view/MainMenu.c b/Pontu/src/view/MainMenu.c
index 4a2ced1..9602a09 100644
--- a/Pontu/src/view/MainMenu.c
+++ b/Pontu/src/view/MainMenu.c
@@ -66,6 +66,7 @@ P_Button* drawMainMenu(SDL_Renderer* renderer,const FontHandler fontHandler, uns
     SDL_Texture* picture = createTextureFromPath(renderer, path);
     SDL_RenderCopy(renderer, picture, NULL, NULL);
     SDL_RenderPresent(renderer);
+    SDL_DestroyTexture(picture);
 	return buttons;
 }
 
@@ -111,7 +112,6 @@ int mainMenu(SDL_Renderer * renderer,SDL_Window * window, GeneralState * general
                     isButtonEntry(&(buttons[1]),event.motion.x,event.motion.y) ||
                     isButtonEntry(&(buttons[2]),event.motion.x,event.motion.y)){
                     playSFX(SFX_menu_sound_effect, audioHandler);
-                    printf("True\n");
                 }
                 break;
             default:
@@ -126,5 +126,11 @@ int mainMenu(SDL_Renderer * renderer,SDL_Window * window, GeneralState * general
         SDL_Delay(20);
     }
 
+Quit:
+    for(int i=0;i<nb;i++){
+        freeButton(&(buttons[i]));
+    }
+    free(buttons);
+
     return 0;
 }

From dc8d05c09171dc0e56cef3982946ca2648954881 Mon Sep 17 00:00:00 2001
From: jathomas2 <jacques.thomas@etu.uca.fr>
Date: Mon, 7 Feb 2022 11:55:05 +0100
Subject: [PATCH 13/14] On game interface, add text label for nbTurn and time

---
 Pontu/src/view/GameInterface.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/Pontu/src/view/GameInterface.c b/Pontu/src/view/GameInterface.c
index c984da4..339784f 100644
--- a/Pontu/src/view/GameInterface.c
+++ b/Pontu/src/view/GameInterface.c
@@ -52,17 +52,31 @@ void drawButtons(SDL_Renderer* renderer, FontHandler fontHandler)
     SDL_Color menuBackgroundColor = {0,255,0,255};
 
     //Postion text label
-    //SDL_Point pos 
+    SDL_Point positonNbTurnLabel = {.x=60, .y=800};
+    SDL_Point positionTimeLablel = {.x=770, .y=800};
+
+    //Color labal
+    SDL_Color colorLabel = {0, 255, 0, 255};
+
+    //Position label
+    POSITIONX_TYPE positionX = POSX_CENTER;
+    POSITIONY_TYPE positionY = POSY_CENTER;
+
 
 
     //SDL_Texture *buttonTexture = createGenericButtonTexture("Menu", NULL, 125, menuBorderColor,menuBackgroundColor,24,5,&sizex,&sizey,renderer);
     SDL_Texture *menuButtonTexture = createGenericButtonTexture("Menu", fontHandler.fonts[FONT_retro], 125, menuBorderColor,menuBorderColor,24,5,&sizex,&sizey,renderer);
     SDL_Texture *menuButtonHoverTexture = createGenericButtonTexture("MenuHover", fontHandler.fonts[FONT_retro], 125, menuBorderColor,menuBackgroundColor,24,5,&sizex,&sizey,renderer);
 
+    //Buttons
     P_Button menuButton = createButton(menuButtonTexture, menuButtonHoverTexture,20,20,100,50,&action); //top left corner (rectangle)
     P_Button settingButton = createButton(menuButtonTexture, menuButtonHoverTexture, 750,10,50,50,&action); //top right corner (square or circle)
     P_Button soundButton = createButton(menuButtonTexture, menuButtonHoverTexture, 825,10,50,50,&action); //top right cornre (square or circle)
-    //TextLabel nbTurn = createTextLabel("Turn",)
+
+    //Labels
+    TextLabel nbTurnLabel = createTextLabel("Turn : ",&positonNbTurnLabel,1,&colorLabel,fontHandler.fonts[FONT_retro],renderer,positionX,positionY);
+    TextLabel timeLabel = createTextLabel("Time : ",&positionTimeLablel,1,&colorLabel,fontHandler.fonts[FONT_retro],renderer,positionX,positionY);
+
 
 
     //bool drawButtonOnRenderer(SDL_Renderer* renderer, P_Button* button);
@@ -108,12 +122,17 @@ void drawButtons(SDL_Renderer* renderer, FontHandler fontHandler)
         drawButtonOnRenderer(renderer,&menuButton);
         drawButtonOnRenderer(renderer,&settingButton);
         drawButtonOnRenderer(renderer,&soundButton);
+        drawTextLabel(renderer,&nbTurnLabel);
+        drawTextLabel(renderer,&timeLabel);
         SDL_RenderPresent(renderer);
 
         SDL_Delay(20);
     }
 
 
+    //FREE TEXT LABEL + BUTTON 
+
+
 
 
 }
\ No newline at end of file

From 4babc2db8efc397eff64b080dbdfe6d988d28b58 Mon Sep 17 00:00:00 2001
From: marouault <martin.rouault@etu.uca.fr>
Date: Mon, 7 Feb 2022 12:01:36 +0100
Subject: [PATCH 14/14] Game Main modified (need to correct drawMovePiece and
 drawDeleteBridge)

---
 Pontu/entryPoints/main.c  | 4 ++--
 Pontu/src/view/GameMain.c | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Pontu/entryPoints/main.c b/Pontu/entryPoints/main.c
index dfeee84..5e11e97 100644
--- a/Pontu/entryPoints/main.c
+++ b/Pontu/entryPoints/main.c
@@ -43,7 +43,7 @@ int main(int argc, char const *argv[]) {
     FontHandler fontHandler = loadFonts();
     AudioHandler audioHandler = newAudioHandler(128, 128, 128);
 
-    generalState = GS_MainMenu;
+    generalState = GS_GameCreationMenu;
     while(generalState != GS_Quit){
         switch (generalState) {
 			case GS_MainMenu:
@@ -67,7 +67,7 @@ int main(int argc, char const *argv[]) {
 					fprintf(stderr,"sorry");
 					exit(-1);
 				}*/
-
+				generalState = GS_Game;
 				gameView(&generalState, window, renderer, players, nbPlayers);
 
 				endGameMenu(&generalState, window, renderer, &fontHandler, players, nbPlayers);
diff --git a/Pontu/src/view/GameMain.c b/Pontu/src/view/GameMain.c
index 5b08067..bd19a9c 100644
--- a/Pontu/src/view/GameMain.c
+++ b/Pontu/src/view/GameMain.c
@@ -20,7 +20,7 @@ SDL_Rect boardRectFromWindowSize(int windowW, int windowH) {
 void gameView(GeneralState* generalState, SDL_Window* window, SDL_Renderer* renderer, Player players[], size_t nbPlayers)
 {
 	if (*generalState != GS_Game) {
-		return ;
+		return;
 	}
 	GameInputProcessor inputProcessor = createGameInputProcessor();
 	struct array_Coord interactiveCases = array_Coord_Create();
@@ -38,9 +38,8 @@ void gameView(GeneralState* generalState, SDL_Window* window, SDL_Renderer* rend
 	drawFullBoard(renderer, &boardRect, &game.board, textureHandler.textures[TEXTURE_Island], textureHandler.textures[TEXTURE_Bridge], textureHandler.textures[TEXTURE_Water]);
 	for (int iPlayer=0; iPlayer<nbPlayers; ++iPlayer) {
 		drawPiecesPlayer(renderer, &boardRect, game.board.arrPieces, game.board.nbPieces, iPlayer, textureHandler.textures[TEXTURE_PieceRed]);
-		//SDL_Renderer* renderer, const SDL_Rect* boardRect, const Piece arrPieces[], const size_t nbPieces, const size_t numPlayer,  SDL_Texture* piece
 	}
-	
+
 	SDL_RenderPresent(renderer);
 
 
@@ -73,7 +72,9 @@ void gameView(GeneralState* generalState, SDL_Window* window, SDL_Renderer* rend
 
 				moveOnBoard(inputElement.data.move.start, inputElement.data.move.end, &game);
 
-				
+				drawMovePiece(renderer, &boardRect, &inputElement.data.move.start, &inputElement.data.move.end, textureHandler.textures[TEXTURE_PieceRed], textureHandler.textures[TEXTURE_Island]);
+			
+				SDL_RenderPresent(renderer);
 				break;
 			case InputType_ClickGame:
 				fprintf(stderr, "Clic on board (%d; %d)\n", inputElement.data.coord.x, inputElement.data.coord.y);