From 38bc6bf6d927ef210b341b506e371a8b813c6378 Mon Sep 17 00:00:00 2001 From: pedroBzh Date: Sat, 28 Nov 2020 13:48:52 +0100 Subject: [PATCH] collisions/map border restrictions --- assets-fx/img/tilemap.png | Bin 355 -> 393 bytes binnword.g1a | Bin 23628 -> 23972 bytes build-fx/assets/img/tilemap.png.o | Bin 980 -> 1260 bytes build-fx/binnword.bin | Bin 23116 -> 23460 bytes build-fx/binnword.elf | Bin 35080 -> 35500 bytes build-fx/map | 752 +++++++++++++++--------------- build-fx/src/main.c.o | Bin 2800 -> 2972 bytes src/main.c | 28 +- xhc | 83 ++++ 9 files changed, 481 insertions(+), 382 deletions(-) create mode 100644 xhc diff --git a/assets-fx/img/tilemap.png b/assets-fx/img/tilemap.png index 3020099fab7acdf348d3c4ce9a1c565d0926143f..a3776d50e11847d857152ccf0ae37d51f7a36d7d 100644 GIT binary patch delta 310 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 diff --git a/build-fx/assets/img/tilemap.png.o b/build-fx/assets/img/tilemap.png.o index 1692f296e6f4950f058523c7992ed8846dfecebd..fac08747669f239c06a00531b56b9bfc36aac0ad 100644 GIT binary patch delta 305 zcmcb@{)Tgck{F8$0|=OaNeu>81{Mb10=bD6+HwpEQEtr(UI~C@7!2qC{nzsu%3)y8 znAj-A#GpBGu9PK%qJ*DdOWg#BIt7_jrvLvxKsXE#xg;ppaQ57P4GC~FCVr4+WSGpu z2qZUaFgh@@em=ne|NrDfCUMq=m=|n}5LSSOnBA6w_(*5l(8Ve!Y0M~&q z1!A%wv)beWCf>;{Oj1J3J|HIo-NFc@Un#Ba9e3+G(m>VV+Fsm^!Uzj`t MNU<oa+yDRo delta 221 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 diff --git a/build-fx/binnword.elf b/build-fx/binnword.elf index b4106b4296e302cde0365fc96a6bacf2f12a5bbd..fe3f77fd365260f5d9332471fd9b814cf3c538db 100755 GIT binary patch delta 8816 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 V<9xi=o3Vd{VG%@$J_s;l{}27Y-v0mq delta 8681 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 diff --git a/src/main.c b/src/main.c index 17cd71c..c86ce88 100644 --- a/src/main.c +++ b/src/main.c @@ -1,10 +1,14 @@ extern "C"{ #include #include + //#include } -#define MAP_X 50 +#define MAP_X 100 + +using namespace std; + int sx = 0; -int x = 30; +int x = 1000; int y = 30; extern bopti_image_t img_tilemap; int game_map[MAP_X+1][7]; @@ -27,6 +31,11 @@ int isMultipleof5 (int n) return 0; } + +void PrintSblock(int num,int x,int y){ + dsubimage(x*10, y*10+4 ,&img_tilemap,num*10,10,10, 10, DIMAGE_NONE); +} + void PrintMap(){ int cx = MAP_X; int cy = 6; @@ -34,6 +43,11 @@ void PrintMap(){ cy = 6; while(cy>0){ dsubimage(cx*10-sx, cy*10+4 ,&img_tilemap,game_map[cx][cy]*10,0,10, 10, DIMAGE_NONE); + /*if(game_map[cx][cy]==2&&game_map[cx][cy]>1&&game_map[cx][cy] master, origin/master, origin/HEAD) +Author: pedroBzh +Date: Thu Nov 19 08:01:00 2020 +0100 + + player spawn + +commit f0de7dc3229652033be83f8e5f549ba9d6062ae0 +Author: pedroBzh +Date: Thu Nov 19 07:29:33 2020 +0100 + + good tree generation + +commit c84a904bfc528205e2710adaa3c3982ca8c9879f +Author: pedroBzh +Date: Wed Nov 18 22:23:29 2020 +0100 + + tree generation + +commit c852e2f05180ff18167fb4b0456d3f919d65d6fd +Author: pedroBzh +Date: Sun Nov 15 09:56:44 2020 +0100 + + deplacement dans le monde/gravité/sans mort + +commit 57fb28705451a32d107a3585287eda7754b13c73 +Author: pedroBzh +Date: Thu Nov 12 13:09:45 2020 +0100 + + map scrolling + +commit 5ba0b54328fb2b58fcd8160aaa8d742e7f1f4270 +Author: pedroBzh +Date: Thu Nov 12 07:44:04 2020 +0100 + + callage de l'affichage + +commit caf75490a9552c5cc49b63ac86300876e7d9f419 +Author: pedroBzh +Date: Thu Nov 12 07:36:37 2020 +0100 + + génération de base/affichage + +commit 26b36cebd769ed0da10a5b2e63721f1007a39945 +Author: pedroBzh +Date: Wed Nov 11 12:26:45 2020 +0100 + + affichage block/mache pas + +commit c6b70ddbe15ba4a50f4f6b1b1e899e9e5d60575f +Author: pedroBzh +Date: Wed Nov 11 12:03:55 2020 +0100 + + gcc -> g++ + +commit 8a179fea21eb0241bd8ace67867d7dde036eb8a1 +Author: pedroBzh +Date: Wed Nov 11 12:00:40 2020 +0100 + + src + +commit 54268d203353041a5958e09b1502f940bdb954d5 +Author: Pedrobzh +Date: Wed Nov 11 11:34:35 2020 +0100 + + Mise à jour de 'README.md' + +commit 912c367b1ea49abaac238366f531d28fc4bd7562 +Author: Pierre Goacolou +Date: Wed Nov 11 11:30:33 2020 +0100 + + base + +commit 0d47361754e7913201cf2dcb1827b166975252c8 +Author: Pedrobzh +Date: Wed Nov 11 11:17:53 2020 +0100 + + Mise à jour de 'README.md' + +commit c5dc603de333e5647beaa047c15e0b1afc5d8d86 +Author: Pedrobzh +Date: Wed Nov 11 11:15:40 2020 +0100 + + Initial commit