From cc80849f10a6b87b596d595d2c4b0cdb436bf48f Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Sun, 7 Sep 2014 21:10:06 -0500
Subject: [PATCH] 	modified:   16/modex16/scroll.c 	modified:  
 16/modex16/scroll.exe

---
 16/modex16/scroll.c   | 343 +++++++++++++++++++++---------------------
 16/modex16/scroll.exe | Bin 18350 -> 18336 bytes
 2 files changed, 172 insertions(+), 171 deletions(-)

diff --git a/16/modex16/scroll.c b/16/modex16/scroll.c
index 89a06aeb..697f5f21 100644
--- a/16/modex16/scroll.c
+++ b/16/modex16/scroll.c
@@ -6,29 +6,29 @@
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */
 
 typedef struct {
-    bitmap_t *data;
-    word tileHeight;
-    word tileWidth;
-    unsigned int rows;
-    unsigned int cols;
+	bitmap_t *data;
+	word tileHeight;
+	word tileWidth;
+	unsigned int rows;
+	unsigned int cols;
 } tiles_t;
 
 
 typedef struct {
-    byte    *data;
-    tiles_t *tiles;
-    int width;
-    int height;
+	byte	*data;
+	tiles_t *tiles;
+	int width;
+	int height;
 } map_t;
 
 
 typedef struct {
-    map_t *map;
-    page_t *page;
-    int tx;
-    int ty;
-    word dxThresh;
-    word dyThresh;
+	map_t *map;
+	page_t *page;
+	int tx;
+	int ty;
+	word dxThresh;
+	word dyThresh;
 } map_view_t;
 
 
@@ -47,146 +47,147 @@ void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
 
 #define SWAP(a, b) tmp=a; a=b; b=tmp;
 void main() {
-    int show1=1;
-    int tx, ty;
-    int x, y;
+	int show1=1;
+	int tx, ty;
+	int x, y;
 	//int ch=0x0;
 	byte ch;
-	int q=0;
-    page_t screen,screen2;
-    map_t map;
-    map_view_t mv, mv2;
-    map_view_t *draw, *show, *tmp;
-    byte *ptr;
-    
-    /* create the map */
-    map = allocMap(40,30);
-    initMap(&map);
-    mv.map = &map;
-    mv2.map = &map;
-
-    /* draw the tiles */
-    ptr = map.data;
-    modexEnter();
-    screen = modexDefaultPage();
-    screen.width = 352;
-    mv.page = &screen;
-    screen2=modexNextPage(mv.page);
-    mv2.page = &screen2;
-    mapGoTo(&mv, 0, 0);
-    mapGoTo(&mv2, 0, 0);
-    modexShowPage(mv.page);
-
-    /* set up paging */
-    show = &mv;
-    draw = &mv2;
-
-    while(!keyp(1)) {
+	int q=0;
+	setkb(1);
+	page_t screen,screen2;
+	map_t map;
+	map_view_t mv, mv2;
+	map_view_t *draw, *show, *tmp;
+	byte *ptr;
+	
+	/* create the map */
+	map = allocMap(40,30);
+	initMap(&map);
+	mv.map = &map;
+	mv2.map = &map;
+
+	/* draw the tiles */
+	ptr = map.data;
+	modexEnter();
+	screen = modexDefaultPage();
+	screen.width = 352;
+	mv.page = &screen;
+	screen2=modexNextPage(mv.page);
+	mv2.page = &screen2;
+	mapGoTo(&mv, 0, 0);
+	mapGoTo(&mv2, 0, 0);
+	modexShowPage(mv.page);
+
+	/* set up paging */
+	show = &mv;
+	draw = &mv2;
+
+	while(!keyp(1)) {
 	if(keyp(77)){
-	    for(q=0; q<16; q++) {
+		for(q=0; q<16; q++) {
 		mapScrollRight(draw, 1);
 		modexShowPage(draw->page);
 		SWAP(draw, show);
-	    }
+		}
 	}
 
 	if(keyp(75)){
-	    for(q=0; q<16; q++) {
+		for(q=0; q<16; q++) {
  		mapScrollLeft(draw, 1);
 		modexShowPage(draw->page);
 		SWAP(draw, show);
-	    }
+		}
 	}
 
 	if(keyp(80)){
-	    for(q=0; q<16; q++) {
+		for(q=0; q<16; q++) {
 		mapScrollDown(draw, 1);
 		modexShowPage(draw->page);
 		SWAP(draw, show);
-	    }
+		}
 	}
 
 
 	if(keyp(72)){
-	    for(q=0; q<16; q++) {
+		for(q=0; q<16; q++) {
 		mapScrollUp(draw, 1);
 		modexShowPage(draw->page);
 		SWAP(draw, show);
 
-	    }
+		}
 	}
 
-	keyp(ch);
+	//keyp(ch);
 
-    }
+	}
 
-    modexLeave();
-    setkb(0);
+	modexLeave();
+	setkb(0);
 }
 
 
 map_t
 allocMap(int w, int h) {
-    map_t result;
+	map_t result;
 
-    result.width =w;
-    result.height=h;
-    result.data = malloc(sizeof(byte) * w * h);
+	result.width =w;
+	result.height=h;
+	result.data = malloc(sizeof(byte) * w * h);
 
-    return result;
+	return result;
 }
 
 
 void
 initMap(map_t *map) {
-    /* just a place holder to fill out an alternating pattern */
-    int x, y;
-    int i;
-    int tile = 1;
-    map->tiles = malloc(sizeof(tiles_t));
-
-    /* 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->rows = 1;
-    map->tiles->cols = 2;
-
-    i=0;
-    for(y=0; y<16; y++) {
+	/* just a place holder to fill out an alternating pattern */
+	int x, y;
+	int i;
+	int tile = 1;
+	map->tiles = malloc(sizeof(tiles_t));
+
+	/* 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->rows = 1;
+	map->tiles->cols = 2;
+
+	i=0;
+	for(y=0; y<16; y++) {
 	for(x=0; x<32; x++) {
-	    if(x<16)
-	      map->tiles->data->data[i] = 0x00;
-	    else
-	      map->tiles->data->data[i] = 0x47;
-	    i++;
+		if(x<16)
+		  map->tiles->data->data[i] = 0x00;
+		else
+		  map->tiles->data->data[i] = 0x47;
+		i++;
+	}
+	}
+
+	i=0;
+	for(y=0; y<map->height; y++) {
+		for(x=0; x<map->width; x++) {
+			map->data[i] = tile;
+			tile = tile ? 0 : 1;
+			i++;
+		}
+		tile = tile ? 0 : 1;
 	}
-    }
-
-    i=0;
-    for(y=0; y<map->height; y++) {
-        for(x=0; x<map->width; x++) {
-            map->data[i] = tile;
-            tile = tile ? 0 : 1;
-            i++;
-        }
-        tile = tile ? 0 : 1;
-    }
 }
 
 
 void
 mapScrollRight(map_view_t *mv, byte offset) {
-    word x, y;  /* coordinate for drawing */
+	word x, y;  /* coordinate for drawing */
 
-    /* increment the pixel position and update the page */
-    mv->page->dx += offset;
+	/* increment the pixel position and update the page */
+	mv->page->dx += offset;
 
-    /* check to see if this changes the tile */
-    if(mv->page->dx >= mv->dxThresh ) {
+	/* check to see if this changes the tile */
+	if(mv->page->dx >= mv->dxThresh ) {
 	/* go forward one tile */
 	mv->tx++;
 	/* Snap the origin forward */
@@ -196,42 +197,42 @@ mapScrollRight(map_view_t *mv, byte offset) {
 
 	/* draw the next column */
 	x= SCREEN_WIDTH + mv->map->tiles->tileWidth;
-        mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x);
-    }
+		mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x);
+	}
 }
 
 
 void
 mapScrollLeft(map_view_t *mv, byte offset) {
-    word x, y;  /* coordinate for drawing */
+	word x, y;  /* coordinate for drawing */
 
-    /* increment the pixel position and update the page */
-    mv->page->dx -= offset;
+	/* increment the pixel position and update the page */
+	mv->page->dx -= offset;
 
-    /* check to see if this changes the tile */
-    if(mv->page->dx == 0) {
+	/* check to see if this changes the tile */
+	if(mv->page->dx == 0) {
 	/* go backward one tile */
 	mv->tx--;
-        
+		
 	/* Snap the origin backward */
 	mv->page->data -= 4;
 	mv->page->dx = mv->map->tiles->tileWidth;
 
 	/* draw the next column */
-        mapDrawCol(mv, mv->tx-1, mv->ty-1, 0);
-    }
+		mapDrawCol(mv, mv->tx-1, mv->ty-1, 0);
+	}
 }
 
 
 void
 mapScrollUp(map_view_t *mv, byte offset) {
-    word x, y;  /* coordinate for drawing */
+	word x, y;  /* coordinate for drawing */
 
-    /* increment the pixel position and update the page */
-    mv->page->dy -= offset;
+	/* increment the pixel position and update the page */
+	mv->page->dy -= offset;
 
-    /* check to see if this changes the tile */
-    if(mv->page->dy == 0 ) {
+	/* check to see if this changes the tile */
+	if(mv->page->dy == 0 ) {
 	/* go down one tile */
 	mv->ty--;
 	/* Snap the origin downward */
@@ -241,20 +242,20 @@ mapScrollUp(map_view_t *mv, byte offset) {
 
 	/* draw the next row */
 	y= 0;
-        mapDrawRow(mv, mv->tx-1 , mv->ty-1, y);
-    }
+		mapDrawRow(mv, mv->tx-1 , mv->ty-1, y);
+	}
 }
 
 
 void
 mapScrollDown(map_view_t *mv, byte offset) {
-    word x, y;  /* coordinate for drawing */
+	word x, y;  /* coordinate for drawing */
 
-    /* increment the pixel position and update the page */
-    mv->page->dy += offset;
+	/* increment the pixel position and update the page */
+	mv->page->dy += offset;
 
-    /* check to see if this changes the tile */
-    if(mv->page->dy >= mv->dyThresh ) {
+	/* check to see if this changes the tile */
+	if(mv->page->dy >= mv->dyThresh ) {
 	/* go down one tile */
 	mv->ty++;
 	/* Snap the origin downward */
@@ -264,80 +265,80 @@ mapScrollDown(map_view_t *mv, byte offset) {
 
 	/* draw the next row */
 	y= SCREEN_HEIGHT + mv->map->tiles->tileHeight;
-        mapDrawRow(mv, mv->tx-1 , mv->ty+15, y);
-    }
+		mapDrawRow(mv, mv->tx-1 , mv->ty+15, y);
+	}
 
 }
 
 
 void
 mapGoTo(map_view_t *mv, int tx, int ty) {
-    int px, py;
-    unsigned int i;
-
-    /* set up the coordinates */
-    mv->tx = tx;
-    mv->ty = ty;
-    mv->page->dx = mv->map->tiles->tileWidth;
-    mv->page->dy = mv->map->tiles->tileHeight;
-
-    /* set up the thresholds */
-    mv->dxThresh = mv->map->tiles->tileWidth * 2;
-    mv->dyThresh = mv->map->tiles->tileHeight * 2;
-
-    /* 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;
-    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);
+	int px, py;
+	unsigned int i;
+
+	/* set up the coordinates */
+	mv->tx = tx;
+	mv->ty = ty;
+	mv->page->dx = mv->map->tiles->tileWidth;
+	mv->page->dy = mv->map->tiles->tileHeight;
+
+	/* set up the thresholds */
+	mv->dxThresh = mv->map->tiles->tileWidth * 2;
+	mv->dyThresh = mv->map->tiles->tileHeight * 2;
+
+	/* 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;
+	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;
-    }
+	}
 }
 
 
 void
 mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) {
-    word rx;
-    word ry;
-    rx = (i % t->cols) * t->tileWidth;
-    ry = (i / t->cols) * t->tileHeight;
-    modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, t->data);
+	word rx;
+	word ry;
+	rx = (i % t->cols) * t->tileWidth;
+	ry = (i / t->cols) * t->tileHeight;
+	modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, t->data);
 }
 
 
 void 
 mapDrawRow(map_view_t *mv, int tx, int ty, word y) {
-    word x;
-    int i;
+	word x;
+	int i;
 
-    /* the position within the map array */
-    i=ty * mv->map->width + tx;
-    for(x=0; x<SCREEN_WIDTH+mv->dxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
+	/* the position within the map array */
+	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! */
-	    mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
+		/* we are in the map, so copy! */
+		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
 	}
 	i++; /* next! */
-    }
+	}
 }
 
 
 void 
 mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
-    int y;
-    int i;
+	int y;
+	int i;
 
-    /* location in the map array */
-    i=ty * mv->map->width + tx;
+	/* location in the map array */
+	i=ty * mv->map->width + tx;
 
-    /* We'll copy all of the columns in the screen, 
-       i + 1 row above and one below */
-    for(y=0; y<SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
+	/* We'll copy all of the columns in the screen, 
+	   i + 1 row above and one below */
+	for(y=0; y<SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
 	if(i>=0) {
-	    /* we are in the map, so copy away! */
-	    mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
+		/* we are in the map, so copy away! */
+		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
 	}
 	i += mv->map->width;
-    }
+	}
 }
diff --git a/16/modex16/scroll.exe b/16/modex16/scroll.exe
index 3d700ec26c99d8bb7508b34732501d1fa2ab9a89..493d42149c3ea710c4c82cf3744b788a19b7b942 100755
GIT binary patch
delta 3310
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
Z^lu8#9eq}6-<0Nbn^I^SR+tIEe*xFgmH_|&

delta 3336
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

-- 
2.39.5