From 6c3c2701a9f25d2a2a7025474b5233e98b43fa4d Mon Sep 17 00:00:00 2001 From: Milang Date: Sat, 11 Jan 2020 20:37:36 +0100 Subject: [PATCH] add moving plateforms, and config the camera --- SuperCbr.g1a | Bin 59788 -> 60008 bytes build-fx/SuperCbr.bin | Bin 59276 -> 59496 bytes build-fx/SuperCbr.elf | Bin 77076 -> 77396 bytes build-fx/map | 902 +++++++++++++++++----------------- build-fx/src/level.c.o | Bin 14584 -> 14912 bytes build-fx/src/levelchanger.c.o | Bin 2464 -> 2512 bytes build-fx/src/plateforme.c.o | Bin 1884 -> 1904 bytes build-fx/src/world.c.o | Bin 4180 -> 4352 bytes include/plateforme.h | 4 +- include/world.h | 2 + src/level.c | 4 +- src/levelchanger.c | 1 + src/plateforme.c | 12 +- src/world.c | 24 +- 14 files changed, 482 insertions(+), 467 deletions(-) diff --git a/SuperCbr.g1a b/SuperCbr.g1a index 13535bfc3e5d1b3cc9ef348270e28dc3e17f47ca..6d56d638dac9170ca9dc06c7e9553af186d3ada4 100644 GIT binary patch delta 4526 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 delta 4220 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 KcENm4&ioIE_ug~> diff --git a/build-fx/SuperCbr.elf b/build-fx/SuperCbr.elf index b8c598f4fbf61a812b95dbcdb7d0913d23258197..104f4321b1f02348c189401ad6416d7c6cffe981 100755 GIT binary patch delta 12454 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 delta 965 zcmZ9KKWNlY9LK*e*Vx4PFS&YN^?KL*@p{tIE+QgAd)UFD!=Vli9n5hB2bCV)piqbi zr5^2I`xZAv2c2AW5^>R?g2Sa0t$$G{qTpb)LxqCA z@A`M`?5uNY%_%jDOT7itck0Zs!a`IH^U+;le%h>=VNcnZNJUZX=c4E@RIl6pcDDI3 z?4Dn?bsh0~Ug3-lKN@C+qF|GcrDlSrD0D=ZiNC)@=5eD4d)jbY^81oMl>CY0FC||} zdVo&=69cd*O9WB;o@~IMq_e0eUhM%{MsiQ`0m%<1`~=wX#0J=?$;A8P^#ib| z@DoTAuLE7g8^B)TO(3(yQQEh~%1NM`SRBHB;tFtp_zaLE4$cBSB;!Dy_#99mt^vKo z=K-7e0^kr&{vSwb050uc0X*Ug#i!Q}@uU9%mep|l diff --git a/build-fx/src/plateforme.c.o b/build-fx/src/plateforme.c.o index e4dee1abcc6e5d0f7f6344aa72493377522d9573..85037ddef8ecbe4b5216c592f871a952eba9ac26 100644 GIT binary patch delta 698 zcmcb^_knMM5)&K8L=~0#OIiBcBAlaK)0_2=nXk!Iv~2EY*1u*xy_e%LV~a{6kKr7{ zW@b%uaRyCg&Q`@-<`&gZmqea)C&N320c@HN8PzNL^^_$8-4rEySu%tR8AZeb-7TlBI#V{jJjXMFbm8BlL;JyW9bf~tgKM}~(C z#&XVz36~9Q8WnTD<$TNjmh~<38v}R7w}j#j#$KHcrtVu2ZW6fCjw$|B~^d z%`MwRA;p!Bg1syp(+mH<`lq zPZu)sNEx2V5%ytt!(ez0XzX^?2#~R%?jm6pGO0Eo6GWQTGI|*;Wt1jb^#poaiFdOE zx;X;POq2$Oiid@8Cx|cD3FfaaO|}7gNx$nN&vhQ4WtBh)=EDEa|0z}%GBT$#OBvcE z3p+DBW-zn^T9(czm2i1|v4PCy2aM|(8TU<|z^u)9X7V29e8C6?1_lQq1_nkTy_bQ3 zX~tw5mdEu67#KJ}B0#`+gn@w*%4Tw4VBm(aT^Ja6U~CTt23{E3hk=0)#tvX$;D@n8 z7#IX#>>eb&6Oi;yVPIefssXwO=#(2sitbF_z}n3CV6q9DGNZxd2sU*_k;x5Uas`;Y b03-M;pbem+kRj z%8#|%-G{q{)%LeD@+qYlQq=rH_?9dXEZgz zM*=2=KJ3YTepyDUQd-3c*KV0Z@E3&Z0p3}x}1W$&<5dSfJYmywHk%E#1i|= zXNg68QwqbDW8ot0Gnc9_*M*oAmu4#p(}pn7w)<_g&o`_@`(>cjZpraeaC9GT%`v=yqV z&v$d(>~!}|_jVWbnXZOQ6}*;u$0`6%2s06=8@ z06>-TW#&(56F@uIA%R{4=#H5>51=2h2f#4mIe-%*_5m12yZ~@=#ESr@MqC{0y*Jjo z0-zyh$UJ0}-LXTT@viDV+QVV>46@*y+KB)^9p;^3J|vmN28|O1@tnpvxlIKAf#o=c G7ykz_QLHHd diff --git a/build-fx/src/world.c.o b/build-fx/src/world.c.o index c76ab0c44c4d6fc4481952ddfed06083cdb8600f..ac5599ab78432b7f22aaa822e8575e55e6a4cfb5 100644 GIT binary patch delta 1146 zcmZ9MPiPZC6vn^F?xtzdHh;*$KULFBYFbUZNm^)%6;h~2v4RlsYLP|qYXapgJ zT4|x6Fd!a8Jcy?rl!6D(BHrv;k?O^QRVsS$(Bj2|Z#O$h+<|@b{l0lKZ+VmKhtQ&W zUv+p(FCyQhA?dxm>{lJv{kjBCkBa)}HYUB3+|GO;IdV^`Z1<@7KxI2Qv;N9L8*AEK?Sb}8d#SzA zK5F0f(F^Lhr?#`1+D@e@V^-Q6xw*w3%V$_W|16L8A07AnWI9E(>qlDRVMAZ}GxK$H zJ#%nlY0JmQl!Rhbz(!FCOSNu#6Grscu#Dj|Ba_Uj$z)5v2`B3LEDXrQ#C;YgiLVj| zEj~wFqNAsL$ZT!h(sxJ!u zuq7P)&kl!;gEkJ?cz{?o9=|y|&XRVu@Ojd~Lk(kLu3VfR%p*ISt7h}Jxa|JYQ7%*p z^VxiEwouOTeRr?F8b`KVD9+`kEqBA^iL#AYhnv-;UEsKJl{BP1swwm@;Dn{+zGjXb zYw_biyU3Yr?v*dK+j zgwWKj#@=BdY507hYmKG2>RBzMwMNZ|imfzw%YWrDVseaIS$gEv6K5Osz zmJz;c++I(I9-{*I;hU|Fvlkmi7{EaqFsIEY<}>q+`QH3!ek+|kXQcgw%1x!5y0KD9 z@g?;Xi*r@$Zr$JK|IU{8_0b+~Y;@R(SE|>)bT3}q$URsI@=>j$IIkH>p`TnBy)?ET z-I-XOr1t=-eHhEFZy}wb?{rspO7&?;Uy}6bwk`m!;XSF~5ugoFZqYU1()zrlpG*3! zq(4Zy>}c{A2UwE|s{d<`B5C{Fsy#x^?1>QDwJMasfYSf~ diff --git a/include/plateforme.h b/include/plateforme.h index 813b868..bdc9af7 100644 --- a/include/plateforme.h +++ b/include/plateforme.h @@ -32,8 +32,8 @@ typedef struct #define PLATEFORME_HEIGHT 3 #define PLATEFORME_FALLING(x,y,w) {P_FALLING,x,y,x,y,w,0,0,.xmin=0,.xmax=0,0} -#define PLATEFORME_MOVING_H(x,y,w,v,x0,x1) {P_MOVING_H,x,y,x,y,w,0,v,.xmin=x0,.xmax=x0,0} -#define PLATEFORME_MOVING_V(x,y,w,v,y0,y1) {P_MOVING_V,x,y,x,y,w,0,v,.ymin=y0,.ymax=y0,0} +#define PLATEFORME_MOVING_H(x,y,w,v,x0,x1) {P_MOVING_H,x,y,x,y,w,0,v,.xmin=x0,.xmax=x1,0} +#define PLATEFORME_MOVING_V(x,y,w,v,y0,y1) {P_MOVING_V,x,y,x,y,w,0,v,.ymin=y0,.ymax=y1,0} //void reset_plateforme(plateforme_t* p); diff --git a/include/world.h b/include/world.h index a33d44c..710daf2 100755 --- a/include/world.h +++ b/include/world.h @@ -118,6 +118,8 @@ void world_reset(); #define CTG_DEATH 3 int world_get_ctg(int x, int y); +void reset_camera(); + extern world_t * w_current; extern image_t * w_fond; extern int w_current_x; diff --git a/src/level.c b/src/level.c index 3d1fcbd..3252c8e 100644 --- a/src/level.c +++ b/src/level.c @@ -329,13 +329,13 @@ void set_level(int n) GOOMBA(924,16,-1) }; init_ennemies(ennemies0); -/* + plateforme_t plateforme0[]= { PLATEFORME_MOVING_H(15,25,16,1,0,60) }; plateforme_table_size=1; - init_plateformes(plateforme0);*/ + init_plateformes(plateforme0); } } diff --git a/src/levelchanger.c b/src/levelchanger.c index d920b50..e04d319 100644 --- a/src/levelchanger.c +++ b/src/levelchanger.c @@ -109,6 +109,7 @@ int play_level(int l) //int finish_status=0; // FAil finish_level=0; mario_dead=0; set_level(l); + reset_camera(); while(global_quit==0) { if (has_ticked) diff --git a/src/plateforme.c b/src/plateforme.c index cecdf63..dafa992 100644 --- a/src/plateforme.c +++ b/src/plateforme.c @@ -48,7 +48,7 @@ void move_plateforme(plateforme_t* p) { if (p->v) p->v++; - p->y+=p->v; + p->y+=p->v/2; } if (p->type==P_MOVING_H) @@ -58,9 +58,11 @@ void move_plateforme(plateforme_t* p) if (p->v==0) p->v=p->vinit; p->x+=t_v; - if (p->x+p->width >= p->xmax && p->v>0) + if (xc&&yc) + mario.p.x+=t_v; + if (p->x+p->width > p->xmax && p->v>0) p->v *= -1; - if (p->x <= p->xmin && p->v<0) + if (p->x < p->xmin && p->v<0) p->v *= -1; } @@ -80,9 +82,7 @@ void move_plateforme(plateforme_t* p) int s=sgn(p->v); int t_v=((s*p->v+time_id%2)/2)*s; if (p->type==P_FALLING) - mario.p.y+=t_v; - if (p->type==P_MOVING_H) - mario.p.x+=t_v; + mario.p.y+=p->v/2; if (p->type==P_MOVING_V) mario.p.y+=t_v; } diff --git a/src/world.c b/src/world.c index 42732ff..84ea06b 100755 --- a/src/world.c +++ b/src/world.c @@ -164,29 +164,39 @@ static int min(const int x, const int y) return (x>y?y:x); } +static int max_cy=0; + +void reset_camera() +{ + max_cy=mario.p.y; + mario_x_max=mario.p.x; +} + int world_get_real_x0() //mario delta en 0,0 { if (mario.p.x>mario_x_max) mario_x_max=mario.p.x; if (mario_x_max-40>mario.p.x) - mario_x_max--; + mario_x_max=mario.p.x; return min(max(mario_x_max-40,0),w_current_x*8-128); } +void reload_camera() +{ + const int step=3; // on ajoute 1/3 + max_cy+=(mario.p.y-max_cy)/step; +} + int world_get_real_y0() //mario delta en 0,0 { //static int y=mario.p.y; - static int y=0; - if (y>mario.p.y) - y--; - else if (y