X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=8279a20e10a17cb8ce9eb5a26641563a20d126a8;hb=312a36372b6826ad9c6296e17a2586d11355c6b3;hp=215f968ccacb3ba2c3d3a8d54abf5cca7fe42a07;hpb=164b2dfa54902a7262200a924d6e92e29de41841;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 215f968c..8279a20e 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"
@@ -75,9 +75,10 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword
 
 void main() {
 	size_t oldfreemem=GetFreeSize();
-	long emmhandle;
+	/*long emmhandle;
 	long emsavail;
-	char teststr[80];
+	char teststr[80];*/
+	word panswitch=0, panq=1, pand=0; //for panning!
 	int i;
 	static word paloffset=0;
 	bitmap_t ptmp;//, npctmp; // player sprite
@@ -89,7 +90,8 @@ void main() {
 	map_view_t mv, mv2, mv3;
 	map_view_t *bg, *spri, *mask;//, *tmp;
 	byte *dpal, *gpal;
-	byte *ptr, *mappalptr;
+	byte huge *ptr;
+	byte *mappalptr;
 	actor_t player;
 	//actor_t npc0;
 
@@ -99,7 +101,7 @@ void main() {
 		printf("Expanded memory is not present\n");
 		exit(0);
 	}
-     
+
 	if(!emmok())
 	{
 		printf("Expanded memory manager is not present\n");
@@ -121,8 +123,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());
+//0000	fprintf(stderr, "testing~\n");
+	loadmap("data/test.map", &map);
+//0000	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);
@@ -240,11 +244,6 @@ void main() {
 	modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/
 	modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
 
-	//----modexClearRegion(spri->page, player.triggerx*16, player.triggery*16, 16, 16, 1);
-	//----modexClearRegion(bg->page, player.triggerx*16, player.triggery*16, 16, 16, 1);
-
-	//----modexClearRegion(spri->page, 5*16, 5*16, 16, 16, 255);
-	//----modexClearRegion(bg->page, 5*16, 5*16, 16, 16, 255);
 	modexShowPage(spri->page);
 //	printf("Total used @ before loop:			%zu\n", oldfreemem-GetFreeSize());
 	modexFadeOn(4, gpal);
@@ -253,7 +252,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;
@@ -368,12 +369,14 @@ void main() {
 */
 
 	//player movement
-	//TODO: make movement into a function!
+	//TODO: make movement into a function!
+	if(!panswitch){
 	//right movement
 	if((keyp(77) && !keyp(75) && player.d == 0) || player.d == 2)
 	{
 		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))
+		if(bg->tx >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 &&
+		!(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))
 			{
@@ -387,7 +390,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))
 			{
@@ -414,7 +417,8 @@ void main() {
 	if((keyp(75) && !keyp(77) && player.d == 0) || player.d == 4)
 	{
 		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))
+		if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 &&
+		!(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))
 			{
@@ -428,7 +432,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,8 @@ void main() {
 	if((keyp(80) && !keyp(72) && player.d == 0) || player.d == 3)
 	{
 		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))
+		if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 &&
+		!(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 +474,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))
 			{
@@ -496,7 +501,8 @@ void main() {
 	if((keyp(72) && !keyp(80) && player.d == 0) || player.d == 1)
 	{
 		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))
+		if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 &&
+		!(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))
 			{
@@ -510,7 +516,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))
 			{
@@ -532,79 +538,63 @@ void main() {
 		player.triggerx = player.tx;
 		player.triggery = player.ty-1;
 	}
-	//modexClearRegion(mask->page, 66, 66, 2, 40, 0);
-
-
+}else{
 //88 switch!
-/*	//right movement
-	if((keyp(32) && !keyp(30) && player.d == 0) || player.d == 2)
+	//right movement
+	if((keyp(77) && !keyp(75) && pand == 0) || pand == 2)
 	{
-		if(player.d == 0){ player.d = 2; }
-		if(bg->tx >= 0 && bg->tx+20 < map.width)
-		{
-			if(player.q<=(TILEWH/SPEED))
+		if(pand == 0){ pand = 2; }
+			if(panq<=(TILEWH/SPEED))
 			{
 				bg->page->dx++;
+				spri->page->dx++;
 				modexShowPage(bg->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; }
-		}
-//		player.triggerx = player.tx+1;
-//		player.triggery = player.ty;
+				modexShowPage(spri->page);
+				panq++;
+			} else { panq = 1; pand = 0; }
 	}
-
 	//left movement
-	if((keyp(30) && !keyp(32) && player.d == 0) || player.d == 4)
+	if((keyp(75) && !keyp(77) && pand == 0) || pand == 4)
 	{
-		if(player.d == 0){ player.d = 4; }
-		if(bg->tx > 0 && bg->tx+20 <= map.width)
-		{
-			if(player.q<=(TILEWH/SPEED))
+		if(pand == 0){ pand = 4; }
+			if(panq<=(TILEWH/SPEED))
 			{
 				bg->page->dx--;
+				spri->page->dx--;
 				modexShowPage(bg->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; }
-		}
-		//player.triggerx = player.tx-1;
-		//player.triggery = player.ty;
+				modexShowPage(spri->page);
+				panq++;
+			} else { panq = 1; pand = 0; }
 	}
-
 	//down movement
-	if((keyp(31) && !keyp(17) && player.d == 0) || player.d == 3)
+	if((keyp(72) && !keyp(80) && pand == 0) || pand == 3)
 	{
-		if(player.d == 0){ player.d = 3; }
-		if(bg->ty >= 0 && bg->ty+15 < map.height)
-		{
-			if(player.q<=(TILEWH/SPEED))
+		if(pand == 0){ pand = 3; }
+			if(panq<=(TILEWH/SPEED))
 			{
 				bg->page->dy--;
-				modexShowPage(bg->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; }
-		}
-		//player.triggerx = player.tx;
-		//player.triggery = player.ty+1;
+				spri->page->dy--;
+				modexShowPage(bg->page);
+				modexShowPage(spri->page);
+				panq++;
+			} else { panq = 1; pand = 0; }
 	}
-
 	//up movement
-	if((keyp(17) && !keyp(31) && player.d == 0) || player.d == 1)
+	if((keyp(80) && !keyp(72) && pand == 0) || pand == 1)
 	{
-		if(player.d == 0){ player.d = 1; }
-		if(bg->ty > 0 && bg->ty+15 <= map.height)
-		{
-			if(player.q<=(TILEWH/SPEED))
+		if(pand == 0){ pand = 1; }
+			if(panq<=(TILEWH/SPEED))
 			{
 				bg->page->dy++;
-				modexShowPage(bg->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; }
-		}
-		//player.triggerx = player.tx;
-		//player.triggery = player.ty-1;
-	}*/
-
-	if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
+				spri->page->dy++;
+				modexShowPage(bg->page);
+				modexShowPage(spri->page);
+				panq++;
+			} else { panq = 1; pand = 0; }
+	}
+}
+	//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--)
@@ -622,8 +612,9 @@ void main() {
 	printf("1paloffset	=	%d\n", paloffset/3);
 	 modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
 	printf("2paloffset	=	%d\n", paloffset/3);
-	 pdump(bg); pdump(spri); }
+	 pdump(bg); pdump(spri); }
 
+	if(keyp(88)){if(!panswitch) panswitch++; else panswitch--; }
 	if(keyp(87))
 	{
 		modexLeave();
@@ -633,7 +624,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 */
@@ -643,28 +637,24 @@ 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);
-	printf("player.x: %d", player.x);
-	if(player.hp==0) printf("%d wwww\n", player.y+8);
-	else printf("\nplayer.y: %d\n", player.y);
-	printf("player.tx: %d\n", player.tx);
-	printf("player.ty: %d\n", player.ty);
-	printf("player.triggx: %d\n", player.triggerx);
-	printf("player.triggy: %d\n", player.triggery);
-	printf("player.hp: %d\n", player.hp);
-	printf("player.q: %d\n", player.q);
-	printf("player.d: %d\n", player.d);
-	printf("tile data value at player pos: %d\n", player.tx+(player.tx*player.ty));//bg->map->data[]);
+	printf("ty: %d\n", bg->ty);
+	printf("player.x: %d", player.x); printf("		player.y: %d\n", player.y);
+	//if(player.hp==0) printf("%d wwww\n", player.y+8);
+	//else printf("\nplayer.y: %d\n", player.y);
+	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 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());
 	printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");
 	printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
 	printf("Screen: %dx", screen.width);	printf("%d\n", screen.height);
-	printf("Screen2: %dx", screen2.width);	printf("%d\n", screen2.height);
+	printf("Screen2: %dx", screen2.width);	printf("%d\n", screen2.height);
+	//printf("map.width=%d	map.height=%d	map.data[0]=%d\n", bg->map->width, bg->map->height, bg->map->data[0]);
 	//xmsfree(&map);
 	//xmsfree(bg);
 	//xmsfree(spri);
@@ -880,8 +870,8 @@ mapGoTo(map_view_t *mv, int tx, int ty) {
 
 	/* draw the tiles */
 	modexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 0);
-	py=0;
-	i=mv->ty * mv->map->width + mv->tx;
+	py=0;
+	i=mv->ty * mv->map->width + mv->tx;
 	for(ty=mv->ty-1; py < SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; ty++, py+=mv->map->tiles->tileHeight) {
 		mapDrawRow(mv, tx-1, ty, py);
 	i+=mv->map->width - tx;
@@ -896,12 +886,14 @@ 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
 	{
 	rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);
-	ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);
+	ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);
+	printf("i=%d\n", i);
 	//mxPutTile(t->data, x, y, t->tileWidth, t->tileHeight);
 	modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
 	}
@@ -914,7 +906,7 @@ mapDrawRow(map_view_t *mv, int tx, int ty, word y) {
 	int i;
 
 	/* the position within the map array */
-	i=ty * mv->map->width + tx;
+	i=ty * mv->map->width + tx;
 	for(x=0; x<SCREEN_WIDTH+mv->dxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
 	if(i>=0) {
 		/* we are in the map, so copy! */