From 59fa76120054caef4bb3d4f1f0c1f0e001712bd8 Mon Sep 17 00:00:00 2001
From: Romain Jegat <romain.jegat@insa-rennes.fr>
Date: Mon, 16 May 2016 15:25:51 +0200
Subject: [PATCH] Ajout d'un bouton attaquer
---
resources/Skins/coeur.bmp | Bin 6494 -> 6494 bytes
src/affichage.c | 13 ++++++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/resources/Skins/coeur.bmp b/resources/Skins/coeur.bmp
index a694ea6bd61d7d4fbc7c2a50e8a0c89cc512b368..6c4d687ee381e39c3e9df43222849b7869415348 100644
GIT binary patch
delta 886
zcmca-bkAsll8}ZZ1H%zM2xb6-$sc*+Cp&QIPCm$GFZlQGA5<{ekjn-rV<%csQK5<i
zJUu<Xe*FrRwFJsqOZ@xyFEKF@VjzUn*4F;=<qK4S>ExMAs*{bljDU(wC#y1ROy0z)
z4`y$KvL|xrOg3RL2a0P>2C)x7*&n&pC%dz{PB!9H0E(+kzQpPVW(#sCPmX5ugtBEP
zKV%C9vZW>qa>!23Wsd-|#lh^KaJI<g8jf^928REr2&hVAG6!dt45~0HZ*m`Ju^5sN
z5_7URSEVqF52Jy0OxEY7nm8}aTrfTPEKfTtgcZr#4vb5nZBbEC;9wV;{E$^-@&Z1a
z$qt-ClLPo<pb885U|RmdS)KeaF;M{+YayJaD+m+Y31_(q!Ne{Kb+CZ!og6FN&JA-N
zi2q&~yRWN7Dmh^4z(Fn`YKRc<6g7nS184*Ufz`|r)k87-Dt2WWVyMaz#q_Yov+U%(
zV)CF=!n|R_hRFxSL?`o!v%^!0r#M(nZp)S}{QUg97{J!n7MRK>8*)m35*G8fZ{H>h
YN=O2=%TDH#kO3JB&q>f6#l*k>0D#g0A^-pY
literal 6494
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
diff --git a/src/affichage.c b/src/affichage.c
index e7c76ae..15e12e7 100644
--- a/src/affichage.c
+++ b/src/affichage.c
@@ -688,20 +688,24 @@ int affichage_carte()
SDL_Surface* perso; //surfaces affichees sur le cote
SDL_Surface* PV = NULL;
+ SDL_Surface* coeur = NULL;
SDL_Surface* mana = NULL;
SDL_Surface* texte = NULL;
SDL_Surface* nom_joueur = NULL;
SDL_Surface* bouton1 = NULL;
SDL_Surface* bouton2 = NULL;
+ SDL_Surface* bouton3 = NULL;
SDL_Surface* personnage_numero = NULL;
SDL_Surface* nombre_deplacement = NULL;
SDL_Rect pos_perso;
SDL_Rect pos_PV;
+ SDL_Rect pos_coeur;
SDL_Rect pos_mana;
SDL_Rect pos_texte;
SDL_Rect pos_nom_joueur;
SDL_Rect pos_bouton1;
SDL_Rect pos_bouton2;
+ SDL_Rect pos_bouton3;
SDL_Rect pos_personnage_numero;
SDL_Rect pos_nombre_deplacement;
@@ -719,6 +723,8 @@ int affichage_carte()
nom_joueur= TTF_RenderText_Shaded(vieille_police, obtenirNomJoueurCourant(), couleurBlanche, couleurNoire);
bouton1= TTF_RenderText_Shaded(vieille_police, "Perso suivant", couleurDoree, couleurBleue);
bouton2= TTF_RenderText_Shaded(vieille_police, "Joueur suivant", couleurDoree, couleurBleue);
+ bouton3= TTF_RenderText_Shaded(vieille_police, "Attaquer", couleurDoree, couleurBleue);
+ coeur = SDL_LoadBMP("../resources/Skins/coeur.bmp");
char buffer_PV[40];
sprintf(buffer_PV, "PV : %d/%d", obtenirPVPersonnage(perso_actuel),obtenirPVMaxPersonnage(perso_actuel));
@@ -787,10 +793,13 @@ int affichage_carte()
pos_mana.y=pos_PV.y+(3*PV->h)/2;
pos_nombre_deplacement.x=ecran->w-(LARGEUR_BORDURE-25);
pos_nombre_deplacement.y=pos_mana.y+(3*PV->h)/2;
+
pos_bouton2.x=ecran->w-(LARGEUR_BORDURE-25);
- pos_bouton2.y=ecran->h-bouton2->h-40;
+ pos_bouton2.y=ecran->h-bouton3->h-60;
pos_bouton1.x=ecran->w-(LARGEUR_BORDURE-25);
pos_bouton1.y=pos_bouton2.y-(2*bouton2->h);
+ pos_bouton3.x=ecran->w-(LARGEUR_BORDURE-25);
+ pos_bouton3.y=pos_bouton1.y-(2*bouton1->h);
for(j=0; j<HAUTEUR_CARTE; j++)
{
@@ -911,6 +920,7 @@ int affichage_carte()
SDL_BlitSurface(nom_joueur,NULL,ecran,&pos_nom_joueur);
SDL_BlitSurface(bouton1,NULL,ecran,&pos_bouton1);
SDL_BlitSurface(bouton2,NULL,ecran,&pos_bouton2);
+ SDL_BlitSurface(bouton3,NULL,ecran,&pos_bouton3);
SDL_BlitSurface(mana,NULL,ecran,&pos_mana);
SDL_BlitSurface(perso,NULL,ecran,&pos_perso);
SDL_BlitSurface(personnage_numero,NULL,ecran,&pos_personnage_numero);
@@ -938,6 +948,7 @@ int affichage_carte()
SDL_FreeSurface(perso);
SDL_FreeSurface(bouton1);
SDL_FreeSurface(bouton2);
+ SDL_FreeSurface(bouton3);
SDL_FreeSurface(PV);
SDL_FreeSurface(ecran);
SDL_FreeSurface(personnage_numero);
--
GitLab