X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=16%2Fmodex16%2Fscroll.c;h=55ca2cedc07bab235cc820f4f0500a1c2b104e1d;hb=d55b4f17a016ad04e99c3ba78d01a3403585deda;hp=b7a3846cbb04357d18542aa721d254c2cf184895;hpb=89ace9751c073befaf4f610c9b6d1132910f4c1f;p=16.git

diff --git a/16/modex16/scroll.c b/16/modex16/scroll.c
index b7a3846c..55ca2ced 100644
--- a/16/modex16/scroll.c
+++ b/16/modex16/scroll.c
@@ -11,6 +11,7 @@ typedef struct {
 	word tileWidth;
 	unsigned int rows;
 	unsigned int cols;
+	//unsigned int tilex,tiley; // tile position on the map
 } tiles_t;
 
 
@@ -25,13 +26,20 @@ typedef struct {
 typedef struct {
 	map_t *map;
 	page_t *page;
-	int tx;
-	int ty;
-	word dxThresh;
-	word dyThresh;
+	int tx; //appears to be the top left tile position on the viewable screen map
+	int ty; //appears to be the top left tile position on the viewable screen map
+//	int ttx; //bottem right tile
+//	int tty; //bottem left tile
+	word dxThresh; //????
+	word dyThresh; //????
 } map_view_t;
 
-
+struct {
+	int x; //player exact position on the viewable map
+	int y; //player exact position on the viewable map
+	int tx; //player tile position on the viewable map
+	int ty; //player tile position on the viewable map
+} player;
 
 
 map_t allocMap(int w, int h);
@@ -45,87 +53,180 @@ void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);
 void mapDrawRow(map_view_t *mv, int tx, int ty, word y);
 void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
 
-#define SWAP(a, b) tmp=a; a=b; b=tmp;
+#define TILEWH 16
+#define QUADWH (TILEWH/4)
+#define SPEED 2
+
+//place holder definitions
+#define MAPX 40
+#define MAPY 30
+//#define SWAP(a, b) tmp=a; a=b; b=tmp;
 void main() {
-	int show1=1;
-	int tx, ty;
-	int x, y;
-	//int ch=0x0;
-	byte ch;
+	bitmap_t bmp;
 	int q=0;
-	page_t screen,screen2;
+	page_t screen;//,screen2;
 	map_t map;
-	map_view_t mv, mv2;
-	map_view_t *draw, *show, *tmp;
+	map_view_t mv;//, mv2;
+	map_view_t *draw;//, *show, *tmp;
 	byte *ptr;
-	
 
 	setkb(1);
 	/* create the map */
-	map = allocMap(40,30); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
+	map = allocMap(MAPX,MAPY); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
 	initMap(&map);
-	mv.map = ↦
-	mv2.map = ↦
+	mv.map = ↦
+//	mv2.map = ↦
 
 	/* draw the tiles */
-	ptr = map.data;
+	ptr = map.data;
+	bmp = bitmapLoadPcx("ptmp.pcx"); // load sprite
+	modexPalUpdate(bmp.palette);
 	modexEnter();
 	screen = modexDefaultPage();
-	screen.width = 352;
+	screen.width += (TILEWH*2);
 	mv.page = &screen;
-	mapGoTo(&mv, 0, 0);
-	screen2=modexNextPage(mv.page);
-	mv2.page = &screen2;
-	mapGoTo(&mv2, 0, 0);
-	modexShowPage(mv.page);
+//	screen2=modexNextPage(mv.page);
+//	mv2.page = &screen2;
+//	mapGoTo(&mv2, 16, 16);
+//	modexShowPage(mv.page);
 
 	/* set up paging */
-	show = &mv;
-	draw = &mv2;
-
-	while(!keyp(1)) {
-	if(keyp(77)){
-		for(q=0; q<16; q++) {
-		mapScrollRight(draw, 1);
-		modexShowPage(draw->page);
+//	show = &mv;
+//	draw = &mv2;
+	draw = &mv;
+
+//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
+	mapGoTo(draw, 0, 0);
+
+	//TODO: put player in starting position of spot
+	//default player position on the viewable map
+	player.tx = draw->tx + 10;
+	player.ty = draw->ty + 8;
+	player.x = player.tx*TILEWH;
+	player.y = player.ty*TILEWH;
+
+	modexShowPage(draw->page);
+	while(!keyp(1))
+	{
+	//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
+	if(keyp(77))
+	{
+		if(draw->tx >= 0 && draw->tx+20 < MAPX && player.tx == draw->tx + 10)
+		{
+			for(q=0; q<(TILEWH/SPEED); q++)
+			{
+				modexDrawBmp(draw->page, player.x+((q+1)*SPEED), player.y, &bmp);
+				mapScrollRight(draw, SPEED);
+				modexShowPage(draw->page);
 //		mapScrollRight(draw, 1);
 //		SWAP(draw, show);
+			}
+			player.tx++;
+		}
+		else if(player.tx < MAPX)
+		{
+			for(q=0; q<(TILEWH/SPEED); q++)
+			{
+				player.x+=SPEED;
+				modexDrawBmp(draw->page, player.x, player.y, &bmp);
+				modexShowPage(draw->page);
+			}
+			player.tx++;
 		}
 	}
 
-	if(keyp(75)){
-		for(q=0; q<16; q++) {
- 		mapScrollLeft(draw, 1);
-		modexShowPage(draw->page);
+	if(keyp(75)){
+		if(draw->tx > 0 && draw->tx+20 <= MAPX && player.tx == draw->tx + 10)
+		{
+			for(q=0; q<(TILEWH/SPEED); q++)
+			{
+				modexDrawBmp(draw->page, player.x-((q+1)*SPEED), player.y, &bmp);
+				mapScrollLeft(draw, SPEED);
+				modexShowPage(draw->page);
 // 		mapScrollLeft(show, 1);
 //		SWAP(draw, show);
-		}
+			}
+			player.tx--;
+		}
+		else if(player.tx > 0)
+		{
+			for(q=0; q<(TILEWH/SPEED); q++)
+			{
+				player.x-=SPEED;
+				modexDrawBmp(draw->page, player.x, player.y, &bmp);
+				modexShowPage(draw->page);
+			}
+			player.tx--;
+		}
 	}
 
-	if(keyp(80)){
-		for(q=0; q<16; q++) {
-		mapScrollDown(draw, 1);
-		modexShowPage(draw->page);
+	if(keyp(80))
+	{
+		if(draw->ty >= 0 && draw->ty+15 < MAPY && player.ty == draw->ty + 8)
+		{
+			for(q=0; q<(TILEWH/SPEED); q++)
+			{
+				modexDrawBmp(draw->page, player.x, player.y+((q+1)*SPEED), &bmp);
+				mapScrollDown(draw, SPEED);
+				modexShowPage(draw->page);
 //		mapScrollDown(show, 1);
 //		SWAP(draw, show);
+			}
+			player.ty++;
+		}
+		else if(player.ty < MAPY)
+		{
+			for(q=0; q<(TILEWH/SPEED); q++)
+			{
+				player.y+=SPEED;
+				modexDrawBmp(draw->page, player.x, player.y, &bmp);
+				modexShowPage(draw->page);
+			}
+			player.ty++;
 		}
 	}
 
-	if(keyp(72)){
-		for(q=0; q<16; q++) {
-		mapScrollUp(draw, 1);
-		modexShowPage(draw->page);
+	if(keyp(72))
+	{
+		if(draw->ty > 0 && draw->ty+15 <= MAPY && player.ty == draw->ty + 8)
+		{
+			for(q=0; q<(TILEWH/SPEED); q++)
+			{
+				modexDrawBmp(draw->page, player.x, player.y-((q+1)*SPEED), &bmp);
+				mapScrollUp(draw, SPEED);
+				modexShowPage(draw->page);
 //		mapScrollUp(show, 1);
 //		SWAP(draw, show);
+			}
+			player.ty--;
+		}
+		else if(player.ty > 0)// && player.ty <= draw->ty + 8)// && player.ty >= draw->ty+8)
+		{
+			for(q=0; q<(TILEWH/SPEED); q++)
+			{
+				player.y-=SPEED;
+				modexDrawBmp(draw->page, player.x, player.y, &bmp);
+				modexShowPage(draw->page);
+			}
+			player.ty--;
 		}
 	}
-
-	//keyp(ch);
+	//modexDrawBmp(draw->page, player.x, player.y, &bmp);
+	//modexShowPage(draw->page);
 
 	}
-
+
 	modexLeave();
-	setkb(0);
+	setkb(0);
+	printf("Project 16 scroll.exe\n");
+	printf("tx: %d\n", draw->tx);
+	printf("ty: %d\n", draw->ty);
+	printf("player.x: %d\n", player.x);
+	printf("player.y: %d\n", player.y);
+	printf("player.tx: %d\n", player.tx);
+	printf("player.ty: %d\n", player.ty);
 }
 
 
@@ -151,18 +252,18 @@ initMap(map_t *map) {
 
 	/* create the tile set */
 	map->tiles->data = malloc(sizeof(bitmap_t));
-	map->tiles->data->width = 32;
-	map->tiles->data->height= 16;
-	map->tiles->data->data = malloc(32*16);
-	map->tiles->tileHeight = 16;
-	map->tiles->tileWidth = 16;
+	map->tiles->data->width = (TILEWH*2);
+	map->tiles->data->height= TILEWH;
+	map->tiles->data->data = malloc((TILEWH*2)*TILEWH);
+	map->tiles->tileHeight = TILEWH;
+	map->tiles->tileWidth =TILEWH;
 	map->tiles->rows = 1;
 	map->tiles->cols = 2;
 
 	i=0;
-	for(y=0; y<16; y++) {
-	for(x=0; x<32; x++) {
-		if(x<16)
+	for(y=0; y<TILEWH; y++) {
+	for(x=0; x<(TILEWH*2); x++) {
+		if(x<TILEWH)
 		  map->tiles->data->data[i] = 0x24;
 		else
 		  map->tiles->data->data[i] = 0x34;