From d95f08f9ca9f4342804c3b7500846c43865edf20 Mon Sep 17 00:00:00 2001 From: Shadow Date: Sun, 28 Jul 2019 17:48:10 +0200 Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20des=20Sources?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sources/Plague.g1a | Bin 27196 -> 27640 bytes Sources/build-fx/map | 637 ++++++++++++++++---------------- Sources/build-fx/src/Plague.bin | Bin 26684 -> 27128 bytes Sources/build-fx/src/Plague.elf | Bin 36760 -> 37196 bytes Sources/build-fx/src/main.o | Bin 2344 -> 2672 bytes Sources/src/main.c | 48 ++- 6 files changed, 367 insertions(+), 318 deletions(-) diff --git a/Sources/Plague.g1a b/Sources/Plague.g1a index fbb3482a0a4ff72850131bd66bf81a2ad2cec172..e4a1aaef433aa5b067ef29115bed388a60438cb2 100644 GIT binary patch delta 4031 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 delta 3610 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 aW$If58C`U9MJ34ZKXCjYYSFO{GxC4>WipBY diff --git a/Sources/build-fx/src/Plague.elf b/Sources/build-fx/src/Plague.elf index 7199fd39250cbdc884a1c865c516ab388f3df02c..e89bcc26964038997d73ca1479d840a24620c1c6 100755 GIT binary patch delta 9439 zcmb7Ke_T}8mA~)JFu&2^hloh#!7%(%$~=C^51q&W8cAX+zeLlRIt(-X5{*AliJ^T& zjKS&z|x#ymH?m73};m`~G*(3aZJOAwU=N$IB<_bdSP4u|CaC3yTR2r-il|*c% zbV{SQjy=I|B|YRi0sl0_MM5<0yZP(7e$juPlXM=14KYQWs)0&HHHknMXhi%k6H@;Q zfs!8bc|H+myh+5FuM#oiOCq`t6R}hzqN!iKBa75$X8#KNCB1a5FfI^N`MDSuu(}Py zrut|hMu;9Z@;1*Fw?RneR@j`;!@4HirDkH3tSiz8p2Voy9wEYzK_VKyP0gTJ`!!

B$)3^)`lFi;~yP5JJ{y7tG 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 Z>$(W^g6!$F$36QbsM~ReF8H31{{`0MrAPn( delta 9027 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 diff --git a/Sources/build-fx/src/main.o b/Sources/build-fx/src/main.o index 180efccdc7309edd0d03a51ac6c00b8dd4606210..4dcae8260b0af5d73d4bfd2cebb4504d590e7ab5 100644 GIT binary patch delta 1225 zcmZWnTSydP6h1RMJG9*cV8XZjy#D9y5fe!OfUbU#ia>z)Hv{L5L+Lyi4 zb&^kL*RXHof)L9`y$1DpgT4#(2Gm~}^xde}4rh2Y@3i=1-HB*qWX*(D2eDMAcDRaq z6FrIU#F<1_qB8+fM*{rtSJ1Cqo=UFAfsA%mk%_KGGP9K8QtBnoL+8~Ssd{cTMZvvw z&-j&mH+2>LF>()bPcL%8Pd10{x6=dQ#Ef1X8BK10M96BW%B3t+y|1p2)Y)i`?1+M# zu>x|YoK-8y+2QgSEUM*^@=9q1mdfiSu#I=speLtfWvVB=>DX2Uwzua9) z?4KdLe+}g27)18zr`&^nQy|+f1Qb7i+w9fCPLFmzty1zibT{40o#OWeNYv-d49L!q zKYu7348?_T@oBAH^J=)(fxHX3=d<-A!5G*=ibs2^R7k$UFe37C4OSrrSS<`jz;;8p zlj}?ynhFNvCVVs(NcZzYkAjnNPG`5jeE{{q|4R>!#d(@y+DDxxkrU`4lcrAD0XSS( zoxVLi(vs;!GX3VQ0Q_Fm@;3TAksn81y}{2K`UjGnYr?vS__CpXEy>m254dA!xM$!G z4E(WyKR56f20r@_?`i4mEo*~jnrc2mpO|-~Hn*KUcL|#NeSO{DUV6-YioP+oseB2* zCVf2^d?|pLVf@Ez3?Bv9%y0w17KZNv*f%hj2jF115FmqL^v`4%{j(TG|7;F$I~W}9 zJ%<$z0BmFU5WseZD*$pCt_H9&Tmz88FbLIhQsfen$*ksFZK9ZTA>X0fSG<5 zZ}R*Y^;;BCT)|N$>6E2_o1+VsV!VI16r1Nz6={jJz`THyHqi#FB3f>(w_da=yiiKV gtwo}M<8dK6i$yUFi}Uo0RmrsCi@`~}Sga563*X}%M*si- delta 877 zcmZ9KO=uHA6vyB0Cez()#3W7g0hNuLHqAlZG(AL$LIWQ9aae`=fqJMCHEIQsR8O*E zMB*W&b|45=^i;gn;0Ha3!@Yd_Or9~+Dh>9caT$tXo-L3yRTQ>vAODlaEKC6c1HS_?|v8c02LkbIJV zOq2qZcmqDit3ye#4qxKqA_$L;OyD@Lj-gY7v)OBZr0&{?qh8$?@S;mX1q@b2$hiT&A4=}m(UALIb-E} z?)$r9uDm~&DZIyBn1X8!v_3U*r9Iug+`iN{y4ExKr6!wW3oo18;`1i6SZZ=`3vNS} z{^At6*Y;C8-~nK;_i_CK5CfL+=!WSpu+|{Q5s$0SK7>DnPKq z@B?6{$s2fNlYaxaP2L3Xn7jqh-C=$5GB9iu#s}DACU^j!$xZ;j$#|nqlf3{uRrtp& zvqnGiGO>Taedg&VA7;F?R~W$YkT77!W#Fb)g|I!U|3msfkO@hnd54w-ndL@kU5F5F c5|huU%YpmgLEtUj?~r{2n}gH%nXz5_FPMv^iU0rr diff --git a/Sources/src/main.c b/Sources/src/main.c index 143c35f..f0ac843 100755 --- a/Sources/src/main.c +++ b/Sources/src/main.c @@ -1,7 +1,7 @@ /* Nom : Plague Version : - dev- - Dernière modification : 27 Juillet 2019 + Dernière modification : 28 Juillet 2019 Liste des choses à faire : */ @@ -9,6 +9,7 @@ #include #include #include +#include //display_barre : affiche les infos de la barre en dessous du monde @@ -18,11 +19,14 @@ void display_barre(const int *adn, const int *recherche); void display_menu(const int *adn, const int *contagion, const int *severite, const int *letalite); //display_info : affiche les infos sur la maladie selectionnée -void display_info(void); +void display_info(const char *nom, const int adn, const int conta, const int leta, const int sev); //floor : renvoie la partie entière d'une variable double floor(double x); +//copy : copie le contenu de src en écrasant dest +char *copy(char *dest, const char *src); + int main(void) { @@ -41,7 +45,8 @@ int main(void) dfont(&font_plague);//On change la police pour la police custom int fond = 1, fin = 0, key = 0;//variables diverses pour le jeu - int recherche = 25, adn = 0, contagion = 0, severite = 0, letalite = 0;//variables pour la maladie + int recherche = 25, adn = 0, contagion = 0, severite = 0, letalite = 0 , cout, conta, leta, sev;//variables pour la maladie + char nom[20]; dclear(C_WHITE); dimage(0, 0, &img_titre); @@ -63,7 +68,12 @@ int main(void) display_menu(&adn, &contagion, &severite, &letalite);//Menu de modification de la maladie break; case 4: - display_info();//Menu info + copy(nom, "TOUX"); + cout = 0; + conta = 0; + leta = 0; + sev = 0; + display_info(nom, cout, conta, leta, sev);//Menu info break; } @@ -79,6 +89,9 @@ int main(void) case KEY_VARS: fond = 3; break; + case KEY_1: + fond = 4; + break; case KEY_EXIT: if (fond != 1) fond = 1; else fin = 1; @@ -125,10 +138,22 @@ void display_menu(const int *adn, const int *contagion, const int *severite, con } -void display_info(void) +void display_info(const char *nom, const int adn, const int conta, const int leta, const int sev) { - dtext(46, 25, "TOUX", C_BLACK, C_NONE); - dtext(73, 33, "0123", C_BLACK, C_NONE); + char string[100]; + + dtext(47, 25, nom, C_BLACK, C_NONE); + sprintf(string, "%d", adn); + dtext(73, 33, string, C_BLACK, C_NONE); + + sprintf(string, "%d", conta); + dtext(81, 41, string, C_BLACK, C_NONE); + + sprintf(string, "%d", leta); + dtext(74, 49, string, C_BLACK, C_NONE); + + sprintf(string, "%d", sev); + dtext(75, 57, string, C_BLACK, C_NONE); } @@ -136,3 +161,12 @@ double floor(double x) { return (int)x; } + + +char *copy(char *dest, const char *src) +{ + unsigned int i; + for (i =0 ; i <= strlen(src) ; i++) dest[i] = src[i]; + dest[strlen(src) + 1] = '\0'; + return dest; +}