X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.c;h=97b26de3c03b182f0ab1cab6ea9dcccf21f0d115;hb=490586ef0c0a9e48017dc869f38a87d65691697c;hp=798c9aee620d301092c95943d350f0570097abed;hpb=17be56acf6a4d9c44762ea85bc6998955525e864;p=16.git

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 798c9aee..97b26de3 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -115,14 +115,14 @@ modexEnter(sword vq, global_game_variables_t *gv)
 			}
 		break;
 		case 2:
-			CRTParmCount = sizeof(ModeX_192x144regs) / sizeof(ModeX_192x144regs[0]);
+			CRTParmCount = sizeof(ModeX_160x120regs) / sizeof(ModeX_160x120regs[0]);
 			/* width and height */
-			gv->video.page[0].sw=192;
-			gv->video.page[0].sh=144;
+			gv->video.page[0].sw=120;
+			gv->video.page[0].sh=160;
 
 			/* send the CRTParms */
 			for(i=0; i<CRTParmCount; i++) {
-				outpw(CRTC_INDEX, ModeX_192x144regs[i]);
+				outpw(CRTC_INDEX, ModeX_160x120regs[i]);
 			}
 
 			/* clear video memory */
@@ -148,6 +148,23 @@ modexEnter(sword vq, global_game_variables_t *gv)
 				ptr[i] = 0x0000;
 			}
 		break;
+		case 4:
+			CRTParmCount = sizeof(ModeX_192x144regs) / sizeof(ModeX_192x144regs[0]);
+			/* width and height */
+			gv->video.page[0].sw=192;
+			gv->video.page[0].sh=144;
+
+			/* send the CRTParms */
+			for(i=0; i<CRTParmCount; i++) {
+				outpw(CRTC_INDEX, ModeX_192x144regs[i]);
+			}
+
+			/* clear video memory */
+			outpw(SC_INDEX, 0x0f02);
+			for(i=0; i<0x8000; i++) {
+				ptr[i] = 0x0000;
+			}
+		break;
 		case 5:
 			CRTParmCount = sizeof(ModeX_256x192regs) / sizeof(ModeX_256x192regs[0]);
 			/* width and height */
@@ -377,6 +394,90 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
     }
 }
 
+//TODO!
+void
+modexDrawPBufregion(page_t *page, int x, int y, int sx, int sy, int fx, int fy planar_buf_t *p, boolean sprite)
+{
+	int plane;
+	int px, py, i;
+// 	byte near *buff;
+	px=x;
+	py=y;
+// 	buff = _nmalloc(p->pwidth+1);
+	// TODO Make this fast.  It's SLOOOOOOW
+// 	for(plane=0; plane < 4; plane++) {
+// 		i=0;
+// 		modexSelectPlane(PLANE(plane+x));
+// 		for(px = plane; px < p->width; px+=4) {
+// 			offset=px;
+// 			for(py=0; py<p->height/2; py++) {
+// 				//SELECT_ALL_PLANES();
+// 				if(!sprite || p->plane[offset])
+// 					page->data = &(p->plane[offset][i++]);
+// 				offset+=p->width;
+// 				offset++;
+// 			}
+// 		}
+// 	}
+	for(plane=0; plane < 4; plane++) {
+		i=0;
+		modexSelectPlane(PLANE(plane+x));
+		for(; y < py+p->height; y++) {
+			//for(px=0; px < p->width; px++) {
+				//printf("%02X ", (int) p->plane[plane][i++]);
+// 				_fmemcpy(buff, &(p->plane[plane][i+=p->pwidth]), p->pwidth);
+// 				printf("buff %u==%s\n", y, *buff);
+// 				_fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), buff, p->pwidth);
+				_fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), &(p->plane[plane][i+=p->pwidth]), p->pwidth);
+			//}
+		}
+		x=px;
+		y=py;
+	}
+// 	_nfree(buff);
+}
+
+void
+DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)
+{
+	int plane;
+	int px, py, i;
+// 	byte near *buff;
+	px=x;
+	py=y;
+// 	buff = _nmalloc(p->pwidth+1);
+	// TODO Make this fast.  It's SLOOOOOOW
+// 	for(plane=0; plane < 4; plane++) {
+// 		i=0;
+// 		modexSelectPlane(PLANE(plane+x));
+// 		for(px = plane; px < p->width; px+=4) {
+// 			offset=px;
+// 			for(py=0; py<p->height/2; py++) {
+// 				//SELECT_ALL_PLANES();
+// 				if(!sprite || p->plane[offset])
+// 					page->data = &(p->plane[offset][i++]);
+// 				offset+=p->width;
+// 				offset++;
+// 			}
+// 		}
+// 	}
+	for(plane=0; plane < 4; plane++) {
+		i=0;
+		modexSelectPlane(PLANE(plane+x));
+		for(; y < py+p->height; y++) {
+			//for(px=0; px < p->width; px++) {
+				//printf("%02X ", (int) p->plane[plane][i++]);
+// 				_fmemcpy(buff, &(p->plane[plane][i+=p->pwidth]), p->pwidth);
+// 				printf("buff %u==%s\n", y, *buff);
+// 				_fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), buff, p->pwidth);
+				_fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), &(p->plane[plane][i+=p->pwidth]), p->pwidth);
+			//}
+		}
+		x=px;
+		y=py;
+	}
+// 	_nfree(buff);
+}
 
 void
 oldDrawBmp(byte far* page, int x, int y, bitmap_t *bmp, byte sprite)
@@ -588,7 +689,7 @@ void
 modexDrawSpriteRegion(page_t *page, int x, int y,
                       int rx, int ry, int rw, int rh, bitmap_t *bmp) {
     word poffset = (word)page->data + y*(page->width/4) + x/4;
-    byte *data = bmp->data;//+bmp->offset;
+    byte huge *data = bmp->data;//+bmp->offset;
     word bmpOffset = (word) data + ry * bmp->width + rx;
     word width = rw;
     word height = rh;
@@ -616,7 +717,7 @@ modexDrawSpriteRegion(page_t *page, int x, int y,
                 MOV AX, height          ; start the row counter
                 MOV rowCounter, AX      ;
                 MOV DI, poffset         ; go to the first pixel
-                MOV DI, bmpOffset       ; go to the bmp pixel
+                MOV SI, bmpOffset       ; go to the bmp pixel
         ROW_LOOP:
                 MOV CX, width           ; count the columns
         SCAN_LOOP:
@@ -1071,6 +1172,14 @@ modexPalUpdate0(byte *p)
         }
 }
 
+void
+modexPalOverscan(byte *p, word col)
+{
+	modexWaitBorder();
+	outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */
+	outp(PAL_DATA_REG, col);
+}
+
 //color checker~
 //i want to make another vesion that checks the palette when the palette is being appened~
 void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/)
@@ -1211,6 +1320,7 @@ void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, cons
 	word addr = (word) l;
 	word chw=0;
 	byte c;
+	//byte near *bakapee;
 
 	switch(t)
 	{
@@ -1263,9 +1373,14 @@ void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, cons
 		DEC CX
 		JNZ L1
 	}
-
+	//bakapee = _nmalloc(sizeof(byte)*8);
+//TODO: OPTIMIZE THIS!!!!
 		for(i=0; i<w; i++)
 		{
+			/*modexSelectPlane(PLANE(x));
+			j=1<<8;
+			*bakapee=(l[i] & j ? col:bgcol);
+			_fmemcpy(page->data + (((page->width/4) * (y+page->dy+i)) + ((x+page->dx+chw) / 4)), bakapee, 8);*/
 			j=1<<8;
 			xp=0;
 			while(j)
@@ -1277,6 +1392,7 @@ void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, cons
 		}
 		chw += xp;
 	}
+	//_nfree(bakapee);
 }
 
 void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str)