added proper collision detection!! ^^

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 8c19de2faea74f66c8ab966802cdbf103bd12852..7e04266a478e5f0c607a71100c59bc199f1aca2c 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -371,7 +371,7 @@ void main() {
        {\r
                if(player.d == 0){ player.d = 2; }\r
                if(bg->tx >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 &&
-               !(player.tx+1 == TRIGGX && player.ty == TRIGGY))        //collision detection!\r
+               !(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY)) //collision detection!\r
                {\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
@@ -385,7 +385,7 @@ void main() {
                                player.q++;\r
                        } else { player.q = 1; player.d = 0; player.tx++; }\r
                }\r
-               else if(player.tx < map.width && !(player.tx+1 == TRIGGX && player.ty == TRIGGY))\r
+               else if(player.tx < map.width && !(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY))\r
                {\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
@@ -413,7 +413,7 @@ void main() {
        {\r
                if(player.d == 0){ player.d = 4; }\r
                if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 &&
-               !(player.tx-1 == TRIGGX && player.ty == TRIGGY))        //collision detection!\r
+               !(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))       //collision detection!\r
                {\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
@@ -427,7 +427,7 @@ void main() {
                                player.q++;\r
                        } else { player.q = 1; player.d = 0; player.tx--; }\r
                }\r
-               else if(player.tx > 1 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY))\r
+               else if(player.tx > 1 && !(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))\r
                {\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
@@ -455,7 +455,7 @@ void main() {
        {\r
                if(player.d == 0){ player.d = 3; }\r
                if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 &&
-               !(player.tx == TRIGGX && player.ty+1 == TRIGGY))        //collision detection!\r
+               !(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY)) //collision detection!\r
                {\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
@@ -469,7 +469,7 @@ void main() {
                                player.q++;\r
                        } else { player.q = 1; player.d = 0; player.ty++; }\r
                }\r
-               else if(player.ty < map.height && !(player.tx == TRIGGX && player.ty+1 == TRIGGY))\r
+               else if(player.ty < map.height && !(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY))\r
                {\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
@@ -497,7 +497,7 @@ void main() {
        {\r
                if(player.d == 0){ player.d = 1; }\r
                if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 &&
-               !(player.tx == TRIGGX && player.ty-1 == TRIGGY))        //collision detection!\r
+               !(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY))       //collision detection!\r
                {\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
@@ -511,7 +511,7 @@ void main() {
                                player.q++;\r
                        } else { player.q = 1; player.d = 0; player.ty--; }\r
                }\r
-               else if(player.ty > 1 && !(player.tx == TRIGGX &&  player.ty-1 == TRIGGY))\r
+               else if(player.ty > 1 && !(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX &&  player.ty-1 == TRIGGY))\r
                {\r
                        if(player.q<=(TILEWH/SPEED))\r
                        {\r
@@ -533,7 +533,6 @@ void main() {
                player.triggerx = player.tx;\r
                player.triggery = player.ty-1;\r
        }\r
-       //modexClearRegion(mask->page, 66, 66, 2, 40, 0);\r
 }else{
 //88 switch!
        //right movement\r
@@ -589,7 +588,8 @@ void main() {
                        } else { panq = 1; pand = 0; }\r
        }
 }\r
-       if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))\r
+       //if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
+       if(((bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))\r
        {\r
                short i;\r
                for(i=800; i>=400; i--)\r
@@ -619,7 +619,10 @@ void main() {
                        mov ah,31h\r
                        int 21h\r
                }\r
-       }\r
+       }
+
+       if((player.q==1) && !(player.x%TILEWH==0 && player.y%TILEWH==0)) break; //incase things go out of sync!
+\r
        }\r
 \r
        /* fade back to text mode */\r
@@ -629,7 +632,6 @@ void main() {
        modexFadeOff(4, gpal);\r
        modexLeave();\r
        setkb(0);\r
-       //system("mem /E /P");\r
        printf("Project 16 scroll.exe\n");\r
        printf("tx: %d\n", bg->tx);\r
        printf("ty: %d\n", bg->ty);
@@ -639,7 +641,7 @@ void main() {
        printf("player.tx: %d", player.tx); printf("            player.ty: %d\n", player.ty);\r
        printf("player.triggx: %d", player.triggerx); printf("  player.triggy: %d\n", player.triggery);\r
        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))]);\r
+       printf("tile data value at player trigger position: %d\n", bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))]);\r
        printf("palette offset: %d\n", paloffset/3);\r
        printf("Total used: %zu\n", oldfreemem-GetFreeSize());\r
        printf("Total free: %zu\n", GetFreeSize());\r
@@ -878,7 +880,8 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) {
        //if(i==0) i=2;\r
        if(i==0)\r
        {\r
-               //wwww\r
+               //wwww
+               modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 0); //currently the over scan color!\r
        }\r
        else\r
        {\r