X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=16%2Fmodex16%2Fscroll.c;h=8a960eee044d8c229344308a6c4e8dea79acb4c4;hb=d48c3f2da3fb828320dc2817d5ab0e5848d07905;hp=602a63befaa72bc37de4555b0ede8ee2104a010a;hpb=d9c2c14be60cdbde56500d65bdc9d20374d8e1ea;p=16.git

diff --git a/16/modex16/scroll.c b/16/modex16/scroll.c
old mode 100644
new mode 100755
index 602a63be..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,15 +26,15 @@ 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 tilex;
-	int tiley;
+	int tx; //player position on the viewable map
+	int ty; //player position on the viewable map
 } player;
 
 
@@ -47,50 +48,57 @@ void mapGoTo(map_view_t *mv, int tx, int ty);
 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 TILEWH 16
+
+#define TILEWH 16
 #define QUADWH (TILEWH/4)
-#define SWAP(a, b) tmp=a; a=b; b=tmp;
+//#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;
-	byte *ptr;
+	map_view_t mv;//, mv2;
+	map_view_t *draw;//, *show, *tmp;
+	byte *ptr;
+
 	//default player position on the viewable map
-	player.tilex = 10;
-	player.tiley = 8;
+	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<TILEWH; q++) {
 		mapScrollRight(draw, 1);
@@ -127,7 +135,7 @@ void main() {
 //		}
 	}
 
-	//keyp(ch);
+	//keyp(ch);
 	modexShowPage(draw->page);
 
 	}