X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=7c542a8db1d46a9978a6d8879f4c01a3d8dbea8a;hb=5a58cbe2fbb89c31abbb46b23d6bfc6d2765cca5;hp=8c19de2faea74f66c8ab966802cdbf103bd12852;hpb=a90e0d1e727754573f287bc7ed5107d76e83c52b;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 8c19de2f..7c542a8d 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,5 +1,5 @@
 #include "src/lib/dos_kb.h"
-#include "src/lib/mapread.c"
+#include "src/lib/mapread.h"
 //#include "16\lib\x\modex.h"
 #include "src/lib/wtest/wtest.c"
 #include "src/lib/planar.c"
@@ -100,7 +100,7 @@ void main() {
 		printf("Expanded memory is not present\n");
 		exit(0);
 	}
-     
+
 	if(!emmok())
 	{
 		printf("Expanded memory manager is not present\n");
@@ -122,8 +122,10 @@ void main() {
 	}*/
 
 	/* create the map */
-//0000	printf("Total used @ before map load:			%zu\n", oldfreemem-GetFreeSize());
-	loadmap("data/test.map", &map);
+//0000	printf("Total used @ before map load:			%zu\n", oldfreemem-GetFreeSize());
+	fprintf(stderr, "testing~\n");
+	loadmap("data/test.map", &map);
+	fprintf(stderr, "yay map loaded~~\n");
 //----	map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
 	//if(isEMS()) printf("%d tesuto\n", coretotalEMS());
 //----	initMap(&map);
@@ -249,7 +251,9 @@ void main() {
 	//top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
 	//to stop scrolling and have the player position data move to the edge of the screen with respect to the direction
 	//when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map
-	#define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
+	#define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
+
+	//modexClearRegion(bg->page, player.x, player.y, 16, 16, 4); //currently the over scan color!
 	/*#define INC_PER_FRAME_NPC if(npc0.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
 
 	if(npc0.d == 0 && npc0.q == 1) npc0.d =rand()%8;
@@ -371,7 +375,7 @@ void main() {
 	{
 		if(player.d == 0){ player.d = 2; }
 		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.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY))	//collision detection!
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -385,7 +389,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.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY))
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -413,7 +417,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.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))	//collision detection!
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -427,7 +431,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.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -455,7 +459,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.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY))	//collision detection!
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -469,7 +473,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.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY))
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -497,7 +501,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.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY))	//collision detection!
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -511,7 +515,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.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX &&  player.ty-1 == TRIGGY))
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -533,7 +537,6 @@ void main() {
 		player.triggerx = player.tx;
 		player.triggery = player.ty-1;
 	}
-	//modexClearRegion(mask->page, 66, 66, 2, 40, 0);
 }else{
 //88 switch!
 	//right movement
@@ -589,7 +592,8 @@ void main() {
 			} else { panq = 1; pand = 0; }
 	}
 }
-	if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
+	//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))
 	{
 		short i;
 		for(i=800; i>=400; i--)
@@ -619,7 +623,10 @@ void main() {
 			mov ah,31h
 			int 21h
 		}
-	}
+	}
+
+	if((player.q==1) && !(player.x%TILEWH==0 && player.y%TILEWH==0)) break;	//incase things go out of sync!
+
 	}
 
 	/* fade back to text mode */
@@ -629,7 +636,6 @@ void main() {
 	modexFadeOff(4, gpal);
 	modexLeave();
 	setkb(0);
-	//system("mem /E /P");
 	printf("Project 16 scroll.exe\n");
 	printf("tx: %d\n", bg->tx);
 	printf("ty: %d\n", bg->ty);
@@ -639,7 +645,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());
@@ -878,7 +884,8 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) {
 	//if(i==0) i=2;
 	if(i==0)
 	{
-		//wwww
+		//wwww
+		modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 0); //currently the over scan color!
 	}
 	else
 	{