X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2F16_vl.c;h=7e67b01293432e91b9166b430996522576c12711;hb=c99bda70e2b46d085d3ba7aa951117bcd737c208;hp=f241fb6ebbe0ebc0c9313c70e7d931c2ce8f157c;hpb=ac5b41ce7c622859a30a7a779b0d07bbc3f7cddf;p=16.git

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index f241fb6e..7e67b012 100755
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -409,20 +409,21 @@ modexSelectPlane(byte plane) {
 }
 
 void
-modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
+modexClearRegion(page_t *page, int x, int y, int w, int h, byte color)
+{
 	word pageOff = (word) page->data;
-	word xoff=x/4;	   /* xoffset that begins each row */
-	word scanCount=w/4;  /* number of iterations per row (excluding right clip)*/
-	word poffset = pageOff + y*(page->stridew) + xoff; /* starting offset */
-	word nextRow = page->stridew-scanCount-1;  /* loc of next row */
-	byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08};  /* clips for rectangles not on 4s */
+	word xoff=(x>>2);							// xoffset that begins each row
+	word poffset = pageOff + y*(page->stridew) + xoff;	// starting offset
+	word scanCount=w>>2;						// number of iterations per row (excluding right clip)
+	word nextRow = page->stridew-scanCount-1;		// loc of next row
+	byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08};			// clips for rectangles not on 4s
 	byte rclip[] = {0x00, 0x01, 0x03, 0x07};
 	byte left = lclip[x&0x03];
 	byte right = rclip[(x+w)&0x03];
 
-	/* handle the case which requires an extra group */
+	// handle the case which requires an extra group
 	if((x & 0x03) && !((x+w) & 0x03)) {
-	  right=0x0f;
+		right=0x0f;
 	}
 
 	//printf("modexClearRegion(x=%u, y=%u, w=%u, h=%u, left=%u, right=%u)\n", x, y, w, h, left, right);
@@ -492,17 +493,17 @@ modexCopyPageRegion(page_t *dest, page_t *src,
 			word dx, word dy,
 			word width, word height)
 {
-	word doffset = (word)dest->data + dy*(dest->stridew) + dx/4;
-	word soffset = (word)src->data + sy*(src->stridew) + sx/4;
-	word scans   = vga_state.vga_stride;				//++++0000 the quick and dirty fix of the major issue with p16 video display wwww
+	word doffset = (word)dest->data + dy*(dest->stridew) + (dx>>2);
+	word soffset = (word)src->data + sy*(src->stridew) + (sx>>2);
+	word scans	= vga_state.vga_stride+8;				//++++0000 the quick and dirty fix of the major issue with p16 video display wwww
 	word nextSrcRow = src->stridew - scans - 1;
 	word nextDestRow = dest->stridew - scans - 1;
-	byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08};  /* clips for rectangles not on 4s */
+	byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08};			// clips for rectangles not on 4s
 	byte rclip[] = {0x00, 0x01, 0x03, 0x07};
 	byte left = lclip[sx&0x03];
 	byte right = rclip[(sx+width)&0x03];
 
-	/* handle the case which requires an extra group */
+	// handle the case which requires an extra group
 	if((sx & 0x03) && !((sx+width) & 0x03)) {
 		right=0x0f;
 	}
@@ -644,41 +645,39 @@ modexPalSave(byte *palette) {
 }
 
 
-byte *
+/*byte *
 modexNewPal() {
 	byte *ptr;
-	ptr = malloc(PAL_SIZE);
+	ptr = m a l l o c(PAL_SIZE);
 
-	/* handle errors */
+	// handle errors
 	if(!ptr) {
 		printf("Could not allocate palette.\n");
 	}
 
 	return ptr;
-}
+}*/
 
 
 void
-modexLoadPalFile(byte *filename, byte **palette) {
+modexLoadPalFile(byte *filename, byte *palette) {
 	FILE *file;
 	byte *ptr;
 
-	/* free the palette if it exists */
-	if(*palette) {
-	free(*palette);
-	}
+	// free the palette if it exists
+	//if(*palette) { free(*palette); }
 
-	/* allocate the new palette */
-	*palette = modexNewPal();
+	// allocate the new palette
+	//*palette = modexNewPal();
 
-	/* open the file */
+	// open the file
 	file = fopen(filename, "rb");
 	if(!file) {
-	printf("Could not open palette file: %s\n", filename);
+		printf("Could not open palette file: %s\n", filename);
 	}
 
 	/* read the file */
-	ptr = *palette;
+	ptr = palette;
 	while(!feof(file)) {
 	*ptr++ = fgetc(file);
 	}