From 17afa12025a61e52ec294312cefd43a015ca4293 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Sun, 19 Apr 2015 17:06:49 -0500 Subject: [PATCH] added multi tile collision detection it must be polished though~ modified: scroll.exe modified: src/scroll.c --- scroll.exe | Bin 67628 -> 67740 bytes src/scroll.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scroll.exe b/scroll.exe index 744d667bdc760a2cd33b02336582806dd00c37dd..793263620f946ad162d99e18536c9c3b8f82b2b4 100644 GIT binary patch delta 13732 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 >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 && - !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) //collision detection! + !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY)) //collision detection! { if(player.q<=(TILEWH/SPEED)) { @@ -385,7 +385,7 @@ void main() { player.q++; } else { player.q = 1; player.d = 0; player.tx++; } } - else if(player.tx < map.width && !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) + else if(player.tx < map.width && !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -413,7 +413,7 @@ void main() { { if(player.d == 0){ player.d = 4; } if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 && - !(player.tx-1 == TRIGGX && player.ty == TRIGGY)) //collision detection! + !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY)) //collision detection! { if(player.q<=(TILEWH/SPEED)) { @@ -427,7 +427,7 @@ void main() { player.q++; } else { player.q = 1; player.d = 0; player.tx--; } } - else if(player.tx > 1 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY)) + else if(player.tx > 1 && !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -455,7 +455,7 @@ void main() { { if(player.d == 0){ player.d = 3; } if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 && - !(player.tx == TRIGGX && player.ty+1 == TRIGGY)) //collision detection! + !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY)) //collision detection! { if(player.q<=(TILEWH/SPEED)) { @@ -469,7 +469,7 @@ void main() { player.q++; } else { player.q = 1; player.d = 0; player.ty++; } } - else if(player.ty < map.height && !(player.tx == TRIGGX && player.ty+1 == TRIGGY)) + else if(player.ty < map.height && !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -497,7 +497,7 @@ void main() { { if(player.d == 0){ player.d = 1; } if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 && - !(player.tx == TRIGGX && player.ty-1 == TRIGGY)) //collision detection! + !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY)) //collision detection! { if(player.q<=(TILEWH/SPEED)) { @@ -511,7 +511,7 @@ void main() { player.q++; } else { player.q = 1; player.d = 0; player.ty--; } } - else if(player.ty > 1 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY)) + else if(player.ty > 1 && !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -639,7 +639,7 @@ void main() { printf("player.tx: %d", player.tx); printf(" player.ty: %d\n", player.ty); printf("player.triggx: %d", player.triggerx); printf(" player.triggy: %d\n", player.triggery); printf("player.hp: %d", player.hp); printf(" player.q: %d", player.q); printf(" player.d: %d\n", player.d); - printf("tile data value at player pos: %d\n", bg->map->data[(player.tx-1)+(map.width*(player.ty-1))]); + printf("tile data value at player trigger position: %d\n", bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))]); printf("palette offset: %d\n", paloffset/3); printf("Total used: %zu\n", oldfreemem-GetFreeSize()); printf("Total free: %zu\n", GetFreeSize()); -- 2.39.5