From 93a22211d18826e60ba35076422a1ac1cf7357c6 Mon Sep 17 00:00:00 2001 From: Jean-Paul NOEL Date: Sun, 19 Apr 2020 14:13:39 +0200 Subject: [PATCH] =?UTF-8?q?op=C3=A9rationnel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test01.g3a | Bin 48748 -> 48716 bytes build-cg/Test01.bin | Bin 20072 -> 20040 bytes build-cg/Test01.elf | Bin 30224 -> 30096 bytes build-cg/map | 439 +++++++++++++++++++++--------------------- build-cg/src/main.c.o | Bin 1872 -> 1828 bytes src/main.c | 34 ++-- 6 files changed, 237 insertions(+), 236 deletions(-) diff --git a/Test01.g3a b/Test01.g3a index b89ea0b662e87930ada5f75b163f29c5ef8666bb..eb561191ffb2b55db9b66567b03e911d1ad54801 100644 GIT binary patch delta 2157 zcmZWreQZ-z6hHU1-P*OV2XFm?ZtFVODqGwgOdVhHrtMtZa6?E~g3)GdNQ98_wG5H9 z%8)Wz)_FxHV3;yLz=ke7qf10=qQ*t}qZM5EV}EoALde7g2x45A=k^U|;#+?AckaFC z>z#Y<>&7O83lqY^)6s8Yk>Jtr#mNWwx9!2?WR>y{{O4J_d4!PZ`3p5Y;UeZE8N&Ix z9^Z9MMR~chifo#JOPR{KnY)|(8}(vA0~$nt)(u{BrcIqdSJqsER@Dz(x$zpAmH|kE zUgU}mUjft&0!5L!M4j%1x zK&ul<mo|cWfsSrEzC9ag21y#vR&GAtmR}%C@9DSIBxz>$3dWizf0VcD}7p zmxGd-U2R+B|7y{MBucX+mn5;XD9@EjSqyoeWM)z1TTEIGy zc@l3T^CUWuc@n#kc@pi&Jc*si`D{CmPPP?Cp2QYpp2Q|(OhR&?MILH3vt{jbS$4ag ztY)_MLh=mG9sXqQrjwU)YxPyeKVVc_KC#qMcJ>xD-S!m)Nw}%Z6%@iPPW`aCuLKNP zceBPJPJjeRT#$u;5Z8bvpowc`Z9oS)Sr^ZcGXj~ADQCv@pbzNd1~ABmcot;IS%IuL z7=UKq1DZ1e)a(G5oCH4}@&S6JzC(Pvwfl#r+dZ{=#HEg{w&h~?*UhZrGmpMyuU9|p z^6Kl19(}T)$_R#pQ^wI}3buvkkG4@u*cLR0UBR8BP?HGmGmm@yH^k*vcWf2%%}r8 zyBDp3K&7Cf-SZ9+P_4Ja#pztftAutd|u(*?&mX!&O$34GxSR?SP3 z5aPlY7y+mgksn8HSG1vQqT?bkTez5i20SA3gzsfJ#vVYx2Q=5lJcl+2jxiQJw1tzS z`%^or*-}`6F;vHLFBzCBZ-R|<*XkikJNh(fjZtxh|37f%R7!=Gbf?} z!*PBI(TPAG)r0DLRe!Jcrl$r^*b8WsgQ!T77^p|@tziR)^90uoC2{yELfRGmk-vzp znYWIjeLs)P=6A6;irFqh$Uxm!S;f(t)5|j7;>!v>c9dASx*K0AZ8E)=I$kg2;_@SJ zkG6o;V$QX_EOp$iL!yy>qvx|J})+y(uYsy zUS_LE?km)z_5u~}Pc=m_WU=^E9Z>`-cB-;RRyl71`*jV<8?pD*UqzaS$D9{b_n%e$ zP*Vt~DS$ET#nhu!_v|VI=+RaUOzro9&KcnQ@0@8>#Aq)$d*;^64b?ZWTW+My_&^`? x04)(8%^wPUjh2-@oIYY&8V5=f)AI$`;rQ_NhY!k_UL%Wsb9Sa{Iu!l~@h_o=Xnp_y delta 2215 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

^&R< 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 YMut@0sr|v+2VR6xyb{bl2uni#2OAUJxc~qF delta 5179 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 delta 737 zcmY+ze;IoGcU3xoOQ%+29003CdoFpdv`Y6tfin1fDUY zHP??&3PPzsDjFd~FZbetUWH=pO)uIhM2H2B-UtKx9kCbPi|^KTLg z*sEDHyh9t98{VL`tOd5v08`)<>V+4WKG?);WFB~q;x#-&n^-lhql`7c6SSGt!ei9U z0+2#m@cJRDutr!xeXQaJ+{fZ!O|XQTBkrN*hzZ z=7@0=N3a^asKdX8;WhQsYw!g#hP`^R*$^U1N;o2h7*UdzBk|_a+{v!;^;}H)MU0SB z*%w1aTD5VZ?X8rRJ`$bsRHM2@wP+Td<2jAfd6n0!yj8X8f+}b>-lp1gkry>lxAS(@ zt~+>#>d+iIv6KJ4)6#c{zQht*h0Q9_W@+KgJ59OC!+nITvW(>J?S7SL~Nman~P{h<(Q&#T;@brjr3< zI(RneNw|~##BGB_>I|toItS~RtB}RqfS;ImLAF)? E1!G;`VgLXD diff --git a/src/main.c b/src/main.c index 4d909d1..0a6c817 100644 --- a/src/main.c +++ b/src/main.c @@ -5,21 +5,21 @@ int main(void) { //Initialisation de la map int xMap = 50; - int yMap = 15; - int map[15][50] = { {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1}, - {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1}}; + int yMap = 14; + int map[14][50] = { {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1}, + {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1}}; extern image_t img_grass_1; extern image_t img_grass_2; extern image_t img_grass_3; @@ -43,7 +43,7 @@ int main(void) xCamera = 0; } else if (x+xCameraOffset > xMap) { - xCamera = xMap-xCameraOffset; + xCamera = xMap-xCameraOffset*2; }else { xCamera = x-xCameraOffset; @@ -54,7 +54,7 @@ int main(void) yCamera = 0; } else if (y+yCameraOffset > yMap) { - yCamera = yMap-yCameraOffset; + yCamera = yMap-yCameraOffset*2; }else { yCamera = y-yCameraOffset;