From 92fe7d1ff397bea1d6fb4e1e92cab27e52ddded9 Mon Sep 17 00:00:00 2001
From: Henri Montjoie <henri.montjoie@insa-rennes.fr>
Date: Mon, 16 May 2016 23:32:47 +0200
Subject: [PATCH] ajout d'une icone
---
resources/Skins/icone.bmp | Bin 0 -> 3126 bytes
src/affichage.c | 8 +++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 resources/Skins/icone.bmp
diff --git a/resources/Skins/icone.bmp b/resources/Skins/icone.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..2e3377ade4a84c215178d0700af860f7e4c002da
GIT binary patch
literal 3126
zcmbW1`BPI@6vyrF{R8@Af9zl2PhF-~XVi*T*<_V92tggivEo+8S``uPXj>FT4H{7P
zNP+>$N<!Edi>wN0u^mm`zGY#i{l2{TB8W)Me7T%=?>V1y-nsYPbunu{T@(JT#rOsO
zK9Br;vgR{b_(j&02W9;C{lD5SUvb^*#PV0`N?(0h^7?II2J={j&-($(uXx71rwy-n
zlzYFw;$45q`)!%`>r(Gmi-j4?V--H|gg>H|$1R@KyL_3q<*0AUyz4F#8_J1|73Ahh
zYV*y-s-!TFRrtUY{)j^CV%XBBYgS*<4e$EP#QNU}Ft_OFm^<{=yYx0av!j|xs$){?
z*@XKH9wE$Q6+ZBUKcWx|!cyp)XI-Z+snYk|6=LIca%&a+Lp8I#MwZ6NAGQjo+~T=z
zsia3b<B^U##l2=ewSiR};0b?3Ar=I1-XNp@+lGmP8lPPD4QhKe6I&}Qp^h!;;7j}b
z6{7*&M6hZyqFZCZD?@%{)SCI&T2^sJ6k<UD2ec?UY@IU`F%`t7N^1K(Ca#{1uV<5*
zxFV}?_0IsXcb3!biQuI{f5rnYzJWyugjf*30qt$RWz<(#EAQhrJ)O|RLP^bBVY^WA
zBzR|PB_YK@n+Rtm3L^;MfCi?T;+Bg@t|GSRDAcgiz(E<Ud`Z9m?sRBn>83&_JW@)F
z9HIyWa6ki7<)3XMwpNnZrkxMCq!w9uj|9Z(pMF5_IqH_uOpz!Af*@~qB?+d=KWZd5
z-5_J{GbtusQNBgcKMSp_s_9VqlVDD}klGrFQewdY?U;#F`Nc*OpATLw%`7O=+QjOa
zh4)E6v!I&}l??~-t)d#D8sLC-yp>Y<M@;0F+f;lboBl{ply4WWPll>z7nbPm%)+&a
z&@Y35eJ&}}BJ6tOuLi<MXk<Y<VUF@)$5hdY&0K~>RHU(sXNQ9|a|^2UvkSkC2aomo
zwN5G5CT3Y9o@$6{fCJi3ZM0hdMF*K!L*aCxo=lqvW!uI59!d8s1pd9}3xJnA4q!&(
z6tlt(irc#*vVb3_r_S4={WpvdS_2hVhyL@~4hhO}NO_&o$)SKg%rBn`9qRSxI_0I6
zmEJDIH*h&kw0<DU$BUe{ka4v%4p^35%ymhS#wBUHq_VLfQe1cv+}G_#ZD|h$5bz3$
z&$}ab8Fl_>rn{!2=M((8K_dSFjjc&*6J&Uoth_GiK%f88M5rXpPif_G6(lrqFpxs=
zd3(%pO36lkXFYSVb5ZfiMqKTtG7U^3K3<EM=kf3Ej_BZE;Mhp8&?Cpj*0B(>AVscQ
zQhi|Lg<lZOFErB4kC);1&ypohI=P8Km$IGW?jC<ZUsTAL`Y>F71Dn{$q6}>AB8M*7
zA*Gr9)lE&zFT=-MI3~&CHagWHmzUEiY5M}&frtwF1G_qe#AbF^3!^bHNd^|Qs6&4M
z=}_4IcDikRQRkKBsH6KSdBn=%%1SnJ=zrm0aL-Ug*=VncFX~{=yXYJf0~>8oR$(Ar
zS_^w?fS&tjB|Z}M&Jc&JOo~xXArpp!dq-r!#^-t1%2W-KWghT3>@wz2Lq>;?V&cxa
z=z+QAJEPXG7$eWgA`6QOao*5`z2Owt5wxh-&YH$Z(>R4yoK^6%9U_X~XW^|=q}TU>
z;?+b-igdHQ5ru;RaPoWb2?$3WtYwPqo1^81n0bv`N^j${%v|Fr`Qp`T;YybFNh<ph
z52m(1!q2pdr`&AsEH&~MRnWoVV?oC->W1m3f3K=DYW<3_$IhX*1!&Po5JwcB#)V#H
z;w3RQPZqm4^ar{&#Ej4Xzsl7tKX>yvRso$yi{#tDD%^a`Vs&JmDzFRLc%5!;bUu0&
ztAVRDO8YsDUFM_t`1}vMdGoY<@eaJ8G&bRMFW)`)@o;cX_HY`9d|hB4a~<Lz!|eFW
zNT1L2ajv=OCBMpom$)5p3%Hii8JwaMJ-qc<wA#*@sJ$d=^^bczG8{V8BeYC?Ott?3
D1AC>V
literal 0
HcmV?d00001
diff --git a/src/affichage.c b/src/affichage.c
index 15e12e7..91d8fb7 100644
--- a/src/affichage.c
+++ b/src/affichage.c
@@ -125,6 +125,7 @@ int afficher_cartes_personnalisees()
positionsTextes[i].y=i*(textes[0]->h+desc[0]->h+5);
positionsDesc[i].y=positionsTextes[i].y+textes[i]->h;
}
+ SDL_WM_SetIcon(SDL_LoadBMP("../resources/Skins/icone.bmp"), NULL);
fenetre = SDL_SetVideoMode(400, nbChoix*(textes[0]->h+desc[0]->h), 32, SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_RESIZABLE);
while(c==-1)
{
@@ -196,7 +197,7 @@ char* afficherListeClasses(char** nomsClasses, char** skinsClasses, int nbChoix)
}
SDL_SetColorKey(tabSkins[i], SDL_SRCCOLORKEY, SDL_MapRGB(tabSkins[i]->format, 0, 0, 255));
}
-
+ SDL_WM_SetIcon(SDL_LoadBMP("../resources/Skins/icone.bmp"), NULL);
fenetre = SDL_SetVideoMode(260, nbChoix*tabSkins[0]->h, 32, SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_RESIZABLE);
SDL_FillRect(fenetre,NULL,SDL_MapRGB(fenetre->format,0,0,0));
@@ -265,6 +266,7 @@ int saisie_noms_joueurs()
etat=SAISIE_JOUEURS;
police=TTF_OpenFont("../resources/fonts/arial.ttf",26);
+ SDL_WM_SetIcon(SDL_LoadBMP("../resources/Skins/icone.bmp"), NULL);
ecran = SDL_SetVideoMode(LARGEUR_CARTE*(LARGEUR_CASE+1), HAUTEUR_CARTE*(HAUTEUR_CASE+2), 32, SDL_HWSURFACE|SDL_DOUBLEBUF);
if (ecran == NULL) // Si l'ouverture a échoué, on le note et on arrête
{
@@ -340,6 +342,7 @@ int affichage_ecran_accueil()
ajouterUnJoueur(nom_2,&etat);
ajouterUnJoueur(nom_1,&etat);
etat=LANCEMENT;
+ SDL_WM_SetIcon(SDL_LoadBMP("../resources/Skins/icone.bmp"), NULL);
SDL_Surface* ecran = SDL_SetVideoMode(LARGEUR_CARTE*(LARGEUR_CASE+1), HAUTEUR_CARTE*(HAUTEUR_CASE+2), 32, SDL_HWSURFACE|SDL_DOUBLEBUF);
SDL_WM_SetCaption("Elder Internal Ignition",NULL);
SDL_Event event;
@@ -406,6 +409,7 @@ int affichage_menu_configuration()
{
etat=CONFIGURATION;
int nombre_classes=nbClasses();
+ SDL_WM_SetIcon(SDL_LoadBMP("../resources/Skins/icone.bmp"), NULL);
SDL_Surface* ecran = SDL_SetVideoMode(LARGEUR_CARTE*(LARGEUR_CASE+1), HAUTEUR_CARTE*(HAUTEUR_CASE+2), 32, SDL_HWSURFACE|SDL_DOUBLEBUF);
SDL_WM_SetCaption("Elder Internal Ignition",NULL);
SDL_Event event;
@@ -677,6 +681,7 @@ int affichage_carte()
int x=0;
int perso_actuel=4;
SDL_Event event;
+ SDL_WM_SetIcon(SDL_LoadBMP("../resources/Skins/icone.bmp"), NULL);
SDL_Surface* ecran=SDL_SetVideoMode(LARGEUR_CARTE*(LARGEUR_CASE)+LARGEUR_BORDURE, HAUTEUR_CARTE*(HAUTEUR_CASE+2), 32, SDL_HWSURFACE|SDL_DOUBLEBUF);;
SDL_Surface* cases[HAUTEUR_CARTE][LARGEUR_CARTE];
SDL_Surface* persos[NB_PERSO*NB_JOUEURS];
@@ -968,6 +973,7 @@ int affichage_carte()
int afficher_menu()
{
SDL_Event event;
+ SDL_WM_SetIcon(SDL_LoadBMP("../resources/Skins/icone.bmp"), NULL);
SDL_Surface* fenetre = SDL_SetVideoMode(LARGEUR_CARTE*(LARGEUR_CASE+1), HAUTEUR_CARTE*(HAUTEUR_CASE+2), 32, SDL_HWSURFACE|SDL_DOUBLEBUF);
SDL_Surface* bouton_continuer=NULL;
SDL_Surface* bouton_quitter=NULL;
--
GitLab