X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=16%2Fmodex16%2Fscroll.c;h=8a960eee044d8c229344308a6c4e8dea79acb4c4;hb=3e49e24d51e5a253c8bd3caaa447150d009ea85d;hp=4681cbb1572be64430b89a637939762397a3317d;hpb=f2c28a134895df50afee9eaf096e0254b9a17e0d;p=16.git

diff --git a/16/modex16/scroll.c b/16/modex16/scroll.c
old mode 100644
new mode 100755
index 4681cbb1..8a960eee
--- 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,16 @@ typedef struct {
 typedef struct {
 	map_t *map;
 	page_t *page;
-	int tx;
-	int ty;
-	word dxThresh;
-	word dyThresh;
+	int tx; //???? appears to be the tile position on the viewable screen map
+	int ty; //???? appears to be the tile position on the viewable screen map
+	word dxThresh; //????
+	word dyThresh; //????
 } map_view_t;
 
-
+struct {
+	int tx; //player position on the viewable map
+	int ty; //player position on the viewable map
+} player;
 
 
 map_t allocMap(int w, int h);
@@ -45,82 +49,94 @@ 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 SWAP(a, b) tmp=a; a=b; b=tmp;
 void main() {
-	int show1=1;
+//	int show1=1;
 	int tx, ty;
 	int x, y;
 	//int ch=0x0;
-	byte ch;
+//	byte ch;
 	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;
-	
+
+	//default player position on the viewable map
+	player.tx = 10;
+	player.ty = 8;
 
 	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(160,120); //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 = ↦
+//	mv2.map = ↦
 
 	/* draw the tiles */
 	ptr = map.data;
 	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);
+	mapGoTo(&mv, 16, 16);
+//	screen2=modexNextPage(mv.page);
+//	mv2.page = &screen2;
+//	mapGoTo(&mv2, 16, 16);
+//	modexShowPage(mv.page);
 
 	/* set up paging */
-	show = &mv;
-	draw = &mv2;
+//	show = &mv;
+//	draw = &mv2;
+	draw = &mv;
+
+	//TODO: set player position data here according to the viewable map screen thingy
 
 	while(!keyp(1)) {
+	//TODO: 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)){
-		for(q=0; q<16; q++) {
+//		for(q=0; q<TILEWH; q++) {
 		mapScrollRight(draw, 1);
-		modexShowPage(draw->page);
+//		modexShowPage(draw->page);
 //		mapScrollRight(draw, 1);
 //		SWAP(draw, show);
-		}
-	}else
+//		}
+	}
 
 	if(keyp(75)){
-		for(q=0; q<16; q++) {
+//		for(q=0; q<TILEWH; q++) {
  		mapScrollLeft(draw, 1);
-		modexShowPage(draw->page);
+//		modexShowPage(draw->page);
 // 		mapScrollLeft(show, 1);
 //		SWAP(draw, show);
-		}
+//		}
 	}
 
 	if(keyp(80)){
-		for(q=0; q<16; q++) {
+//		for(q=0; q<TILEWH; q++) {
 		mapScrollDown(draw, 1);
-		modexShowPage(draw->page);
+//		modexShowPage(draw->page);
 //		mapScrollDown(show, 1);
 //		SWAP(draw, show);
-		}
-	}else
+//		}
+	}
 
 	if(keyp(72)){
-		for(q=0; q<16; q++) {
+//		for(q=0; q<TILEWH; q++) {
 		mapScrollUp(draw, 1);
-		modexShowPage(draw->page);
+//		modexShowPage(draw->page);
 //		mapScrollUp(show, 1);
 //		SWAP(draw, show);
-		}
+//		}
 	}
 
 	//keyp(ch);
+	modexShowPage(draw->page);
 
 	}
 
@@ -151,18 +167,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;