X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_vl.c;h=a9d4b66805ba28432b976a3cfc2d4395ae4ec00b;hb=eda37da84ccb4fc381507f04832d0358799ed67c;hp=882dd3d2f21f37d6650a7735fa16d3e1da606f83;hpb=f2a811af6076e5d139acaef8c0fcf7c40244d8ed;p=16.git

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index 882dd3d2..a9d4b668 100755
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -28,7 +28,7 @@
 byte far* VGA=(byte far*) 0xA0000000;   /* this points to video memory. */
 
 static void fadePalette(sbyte fade, sbyte start, word iter, byte *palette);
-static byte tmppal[PAL_SIZE];
+/*static */byte tmppal[PAL_SIZE];
 
 //===========================================================================
 
@@ -45,7 +45,8 @@ void	VL_Startup (global_game_variables_t *gvar)
 	__asm	cld;
 
 	VGAmodeX(1/*TODO other modes*/, 1, gvar);
-	VL_LoadPalFileCore(gvar->video.palette, gvar);
+//--	VL_LoadPalFileCore(gvar->video.palette, gvar);
+	VL_SetCorePal(gvar);
 	//Quit ("Improper video card!  If you really have a VGA card that I am not\ndetecting it!", gvar);
 }
 
@@ -282,7 +283,7 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 	switch(vq)
 	{
 		case 1:
-//		case 8: //320x240 no buffer
+		case 8: //320x240 no buffer
 			//CRTParmCount = sizeof(ModeX_320x240regs) / sizeof(ModeX_320x240regs[0]);
 			/*for(i=0; i<CRTParmCount; i++) {
 				outpw(CRTC_INDEX, ModeX_320x240regs[i]);
@@ -354,7 +355,7 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 //--	VL_SetLineWidth (cm.offset, gv);
 	//gv->video.ofs.displayofs = 0;
 	//gv->video.ofs.bufferofs = gv->video.page[0].width*gv->video.page[0].height;//gvar->video.page[0].pagesize;
-//	gv->video.curr_mode=vq;
+	gv->video.curr_mode=vq;
 	gv->video.VL_Started=1;
 }
 
@@ -364,11 +365,11 @@ void modexLeave(void)
 	VL_vgaSetMode(TEXT_MODE);
 }
 
+#if 0
 page_t
 modexDefaultPage(page_t *p)
 {
 	page_t page;
-
 	/* default page values */
 	//page.data = VGA;
 	//page.data = (byte far *)(vga_state.vga_graphics_ram);
@@ -389,12 +390,16 @@ modexDefaultPage(page_t *p)
 	page.pagesize = (word)(page.stridew)*page.height;
 	page.pi=page.width*4;
 	page.id = 0;
-
+	if(ggvv->video.curr_mode = 1)
+	{
+		page.width += TILEWHD;
+		page.height += TILEWHD;
+	}
 	return page;
 }
-#if 0
+#endif
 page_t
-modexDefaultPage(page_t *p, video_t *v)
+modexDefaultPage(page_t *p, global_game_variables_t *gvar)
 {
 	page_t page;
 
@@ -408,7 +413,7 @@ modexDefaultPage(page_t *p, video_t *v)
 	page.sh = p->sh;
 	page.width = p->sw;
 	page.height = p->sh;
-	if(v->curr_mode == 1)
+	if(gvar->video.curr_mode == 1)
 {	page.width += TILEWHD;
 	page.height += TILEWHD; }
 	page.ti.tw = page.sw/TILEWH;
@@ -424,7 +429,7 @@ modexDefaultPage(page_t *p, video_t *v)
 
 	return page;
 }
-#endif
+
 /* returns the next page in contiguous memory
  * the next page will be the same size as p, by default
  */
@@ -509,38 +514,41 @@ void VL_Initofs(video_t *video)
 	}
 }
 
-void modexHiganbanaPageSetup(video_t *video)
+void modexHiganbanaPageSetup(global_game_variables_t *gvar)
 {
-	video->vmem_remain=65535U;
-	video->num_of_pages=0;
-	(video->page[0]) = modexDefaultPage(&(video->page[0])/*, video*/);	video->num_of_pages++;	//video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD);
-	(video->page[1]) = modexNextPage(&(video->page[0]));	video->num_of_pages++;
-//0000	(video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), (video->page[0]).width, TILEWH*4);		video->num_of_pages++;
-//0000	(video->page[3]) = (video->page[2]);		video->num_of_pages++;
-////	(video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), TILEWH*4, TILEWH*4);		video->num_of_pages++;
-////	(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].sw, 208);	video->num_of_pages++;
- 	(video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), video->page[0].width, 96);	video->num_of_pages++;
- 	(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].width, 96);	video->num_of_pages++;
-	modexCalcVmemRemain(video);
-
-	video->sp=video->p =	0;	//showpage
-	video->dorender =	1;			//render
-	video->vh=video->page[0].height+video->page[1].height+video->page[2].height+video->page[3].height;
-
-	VL_Initofs(video);
+	gvar->video.vmem_remain=65535U;
+	gvar->video.num_of_pages=0;
+	(gvar->video.page[0]) = modexDefaultPage(&(gvar->video.page[0]), gvar);	gvar->video.num_of_pages++;	//gvar->video.page[0].width += (TILEWHD); gvar->video.page[0].height += (TILEWHD);
+	(gvar->video.page[1]) = modexNextPage(&(gvar->video.page[0]));	gvar->video.num_of_pages++;
+//0000	(gvar->video.page[2]) = modexNextPageFlexibleSize(&(gvar->video.page[1]), (gvar->video.page[0]).width, TILEWH*4);		gvar->video.num_of_pages++;
+//0000	(gvar->video.page[3]) = (gvar->video.page[2]);		gvar->video.num_of_pages++;
+////	(gvar->video.page[2]) = modexNextPageFlexibleSize(&(gvar->video.page[1]), TILEWH*4, TILEWH*4);		gvar->video.num_of_pages++;
+////	(gvar->video.page[3]) = modexNextPageFlexibleSize(&(gvar->video.page[2]), gvar->video.page[0].sw, 208);	gvar->video.num_of_pages++;
+ 	(gvar->video.page[2]) = modexNextPageFlexibleSize(&(gvar->video.page[1]), gvar->video.page[0].width, 96);	gvar->video.num_of_pages++;
+ 	(gvar->video.page[3]) = modexNextPageFlexibleSize(&(gvar->video.page[2]), gvar->video.page[0].width, 96);	gvar->video.num_of_pages++;
+	modexCalcVmemRemain(&gvar->video);
+
+	gvar->video.sp=gvar->video.p =	0;	//showpage
+	gvar->video.dorender =	1;			//render
+	gvar->video.vh=gvar->video.page[0].height+gvar->video.page[1].height+gvar->video.page[2].height+gvar->video.page[3].height;
+
+	VL_Initofs(&gvar->video);
 	//doslib origi var
-	video->vga_state.omemptr=			vga_state.vga_graphics_ram;
-	video->vga_state.vga_draw_stride=	vga_state.vga_draw_stride;
-	video->vga_state.vga_draw_stride_limit=	vga_state.vga_draw_stride_limit;
+	gvar->video.vga_state.omemptr=			vga_state.vga_graphics_ram;
+	gvar->video.vga_state.vga_draw_stride=	vga_state.vga_draw_stride;
+	gvar->video.vga_state.vga_draw_stride_limit=	vga_state.vga_draw_stride_limit;
 	//sprite render switch and bgpreservation switch
-	video->vga_state.rss=	1;
-	video->vga_state.bgps=	1;
+	gvar->video.vga_state.rss=	1;
+	gvar->video.vga_state.bgps=	1;
 
 	//setup the buffersize
-	video->page[0].dx=video->page[0].dy=
-		video->page[1].dx=video->page[1].dy=TILEWH;	// 1 tile size buffer
-	video->page[2].dx=video->page[2].dy=
-		video->page[3].dx=video->page[3].dy=0;		// cache pages are buffer wwww
+	gvar->video.page[0].dx=gvar->video.page[0].dy=
+		gvar->video.page[1].dx=gvar->video.page[1].dy=TILEWH;	// 1 tile size buffer
+	gvar->video.page[2].dx=gvar->video.page[2].dy=
+		gvar->video.page[3].dx=gvar->video.page[3].dy=0;		// cache pages are buffer wwww
+
+	gvar->video.page[0].tlx=gvar->mv[0].tx*TILEWH;
+	gvar->video.page[0].tly=gvar->mv[0].ty*TILEWH;
 }
 
 //
@@ -563,14 +571,14 @@ modexShowPage(page_t *page) {
 	low_address  = LOW_ADDRESS  | (offset << 8);
 
 	/* wait for appropriate timing and then program CRTC */
-//+=+=										while ((inp(INPUT_STATUS_1) & DISPLAY_ENABLE));
+//+=+=										while ((inp(STATUS_REGISTER_1) & DISPLAY_ENABLE));
 	outpw(CRTC_INDEX, high_address);
 	outpw(CRTC_INDEX, low_address);
 	outp(CRTC_INDEX, 0x13);
 	outp(CRTC_DATA, crtcOffset);
 
 	/* wait for one retrace */
-//+=+=										while (!(inp(INPUT_STATUS_1) & VRETRACE));
+//+=+=										while (!(inp(STATUS_REGISTER_1) & VRETRACE));
 
 	/* do PEL panning here */
 	outp(AC_INDEX, 0x33);
@@ -605,14 +613,14 @@ VL_ShowPage(page_t *page, boolean vsync, boolean sr)
 	low_address  = LOW_ADDRESS  | (offset << 8);
 
 	// wait for appropriate timing and then program CRTC
-	if(vsync) while ((inp(INPUT_STATUS_1) & DISPLAY_ENABLE));
+	if(vsync) while ((inp(STATUS_REGISTER_1) & DISPLAY_ENABLE));
 	outpw(CRTC_INDEX, high_address);
 	outpw(CRTC_INDEX, low_address);
 	outp(CRTC_INDEX, 0x13);
 	outp(CRTC_DATA, crtcOffset);
 
 	// wait for one retrace
-	if(vsync) while (!(inp(INPUT_STATUS_1) & VRETRACE));
+	if(vsync) while (!(inp(STATUS_REGISTER_1) & VRETRACE));
 
 	// do PEL panning here
 	outp(AC_INDEX, 0x33);
@@ -875,11 +883,11 @@ void modexPalSave(byte *palette)
 /*byte *
 modexNewPal() {
 	byte *ptr;
-	ptr = m a l l o c(PAL_SIZE);
+	ptr = mAlloc(PAL_SIZE);
 
 	// handle errors
 	if(!ptr) {
-		printf("Could not allocate palette.\n");
+		printf("Could not Allocate palette.\n");
 	}
 
 	return ptr;
@@ -912,36 +920,60 @@ modexLoadPalFile(byte *filename, byte *palette) {
 	fclose(file);
 }
 
-void VL_LoadPalFile(const char *filename, byte *palette, global_game_variables_t *gvar)
-{
-	VL_LoadPalFilewithoffset(filename, palette, 9, gvar);
-//	VL_LoadPalFileCore(palette);
-}
-
-void VL_LoadPalFileCore(byte *palette, global_game_variables_t *gvar)
-{
-	VL_LoadPalFilewithoffset("data/16.pal", palette, 0, gvar);
-}
+#define COREPALSIZE 9//27	//3*9
 
-void VL_LoadPalFilewithoffset(const char *filename, byte *palette, word o, global_game_variables_t *gvar)
+void VLL_LoadPalFilewithoffset(const char *filename, byte *palette, word o, word palsize, global_game_variables_t *gvar)
 {
 	int fd;
+	byte *newpalette;
 
 	fd = open(filename,O_RDONLY|O_BINARY);
 	if (fd >= 0) {
-		read(fd,palette,	PAL_SIZE);
+		read(fd,palette,	palsize*3);
 		close(fd);
 
-		VL_UpdatePaletteWrite(palette, o, gvar);
+		if(palsize==COREPALSIZE) newpalette = palette; else{	//if core then load it
+		newpalette = &palette[3];			//skip overscan color
+		if(!o) o++;
+		}
+		VL_UpdatePaletteWrite(newpalette, o, palsize, gvar);
 	}
 }
 
-void VL_UpdatePaletteWrite(byte *palette, word o, global_game_variables_t *gvar)
+//++++//
+void VL_SetCorePal(global_game_variables_t *gvar)
 {
+	byte *palette = &corepal;
 	word i;
-	vga_palette_lseek(/*1+*/o);
-	//for (i=o;i < 256-o;i++)
-	for (i=0;i < 256-o;i++)
+
+	vga_palette_lseek(0);
+	for (i=0;i < COREPALSIZE;i++)
+		vga_palette_write(palette[(i*3)+0]>>2,
+						  palette[(i*3)+1]>>2,
+						  palette[(i*3)+2]>>2);
+
+	VL_PaletteSync(gvar);
+}
+
+void VL_LoadPalFile(const char *filename, byte *palette, global_game_variables_t *gvar)
+{
+	VLL_LoadPalFilewithoffset(filename, palette,
+		0,			//overwrite core/system palette
+//		COREPALSIZE,	//preserved core/system palette
+		PAL_SIZE/3, gvar);
+}
+
+void VL_LoadPalFileCore(byte *palette, global_game_variables_t *gvar)
+{
+	VLL_LoadPalFilewithoffset("data/16.pal", palette, 0, COREPALSIZE, gvar);
+}
+
+void VL_UpdatePaletteWrite(byte *palette, word o, word p, global_game_variables_t *gvar)
+{
+	word i;
+
+	vga_palette_lseek(o);
+	for (i=0;i < p-o;i++)
 		vga_palette_write(palette[(i*3)+0]>>2,palette[(i*3)+1]>>2,palette[(i*3)+2]>>2);
 
 	VL_PaletteSync(gvar);
@@ -1025,12 +1057,17 @@ VL_modexPalScramble(byte *p)
 }
 
 word
-modexPalOverscan(word col)
+VL_modexPalOverscan(byte *p, word col)
 {
+	int i;
 	//modexWaitBorder();
 	vga_wait_for_vsync();
 	outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */
-	outp(PAL_DATA_REG, col);
+	for(i=col; i<(3+col); i++)
+	{
+		outp(PAL_DATA_REG, p[i]);
+	}
+//	modexPalSave(p);
 	return col;
 }
 
@@ -1103,7 +1140,7 @@ void modexDrawChar(page_t *page, int x/*for planar selection only*/, word t, wor
 	}
 }
 
-void modexprint(page_t *page, sword x, sword y, word t, boolean tlsw, word col, word bgcol, boolean sw, const byte *str)
+void modexprint(page_t *page, sword x, sword y, word t, boolean tlsw, word color, word bgcolor, boolean vidsw, const byte *str)
 {
 	word s, o, w;
 	word x_draw;
@@ -1112,14 +1149,14 @@ void modexprint(page_t *page, sword x, sword y, word t, boolean tlsw, word col,
 	word addrr;
 	byte c;
 
-	switch(sw)
+	switch(vidsw)
 	{
 		case 0:
 			printf("%s\n", str);
 		break;
 		case 1:
 			if(tlsw){ x-=page->tlx; y-=page->tly; }
-			x_draw = x/4;
+			x_draw = x>>2;
 			addrq = (page->stridew) * y + (word)(x_draw) +
 				((word)page->data);
 			addrr = addrq;
@@ -1145,7 +1182,7 @@ void modexprint(page_t *page, sword x, sword y, word t, boolean tlsw, word col,
 			// no need for inline assembly!
 			// NTS: It might even be faster to just let the modexDrawChar point directly at ROM font than to copy per char! --J.C.
 				_fmemcpy(romFontsData.l,MK_FP(s,o+(w*c))/*ROM font location*/,w/*char size*/);
-				modexDrawChar(page, x_draw/*for mode X planar use*/, t, col, bgcol, addrr);
+				modexDrawChar(page, x_draw/*for mode X planar use*/, t, color, bgcolor, addrr);
 				x_draw += 8; /* track X for edge of screen */
 				addrr += 2; /* move 8 pixels over (2 x 4 planar pixels per byte) */
 			}
@@ -1247,8 +1284,14 @@ void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, c
 	}
 }
 
+//	short hand of modexprint
+void VL_print(const byte *str, nibble pagenum, global_game_variables_t *gvar)
+{
+	modexprint(&(gvar->video.page[pagenum]), gvar->video.print.x, gvar->video.print.y, gvar->video.print.t, gvar->video.print.tlsw, gvar->video.print.color, gvar->video.print.bgcolor, gvar->video.VL_Started, str);
+}
+
 /* palette dump on display! */
-void modexpdump(page_t *pee)
+void modexpdump(nibble pagenum, global_game_variables_t *gvar)
 {
 	int mult=(QUADWH);
 	int palq=(mult)*TILEWH;
@@ -1256,10 +1299,11 @@ void modexpdump(page_t *pee)
 	int palx, paly;
 	for(paly=TILEWH*8; paly<palq+TILEWH*8; paly+=mult){
 		for(palx=TILEWH*12; palx<palq+TILEWH*12; palx+=mult){
-				modexClearRegion(pee, palx+TILEWH, paly+TILEWH, mult, mult, palcol);
+				modexClearRegion(&gvar->video.page[pagenum], palx+TILEWH, paly+TILEWH, mult, mult, palcol);
 			palcol++;
 		}
 	}
+	modexPalSave(gvar->video.palette);
 }
 #if 0
 /////////////////////////////////////////////////////////////////////////////
@@ -1329,11 +1373,11 @@ void VL_PatternDraw(video_t *video, word pn, boolean sw, boolean allsw)
 
 void
 modexWaitBorder() {
-	while(inp(INPUT_STATUS_1)  & 8)  {
+	while(inp(STATUS_REGISTER_1)  & 8)  {
 	// spin
 	}
 
-	while(!(inp(INPUT_STATUS_1)  & 8))  {
+	while(!(inp(STATUS_REGISTER_1)  & 8))  {
 	//spin
 	}
 }
@@ -1341,7 +1385,7 @@ modexWaitBorder() {
 void
 modexWaitBorder_start()
 {
-	while(inp(INPUT_STATUS_1)  & 8)  {
+	while(inp(STATUS_REGISTER_1)  & 8)  {
 	// spin
 	}
 
@@ -1350,7 +1394,7 @@ modexWaitBorder_start()
 void
 modexWaitBorder_end()
 {
-	while(!(inp(INPUT_STATUS_1)  & 8))  {
+	while(!(inp(STATUS_REGISTER_1)  & 8))  {
 	// spin
 	}
 
@@ -1370,17 +1414,25 @@ void VL_PrintmodexmemInfo(video_t *v)
 //	printf("========================================\n");
 	printf("  Virtual Screen: %dx", v->page[0].width);	printf("%d	", v->page[0].height);	printf("Tile: %dx", v->page[0].ti.tilesw);		printf("%d", v->page[0].ti.tilesh);	printf("=((Virtual Screen)/16)\n");
 	printf("  	  Screen: %dx", v->page[0].sw);		printf("%d	", v->page[0].sh);		printf("Tile: %dx", v->page[0].ti.tw);			printf("%d", v->page[0].ti.th);		printf("=((Screen)/16)\n");
-
-	printf("  Free Video Memory: %u\n", v->vmem_remain);
-	printf("  page");
-	for(i=0; i<v->num_of_pages;i++)
+	printf("  vga_stride: %u ", vga_state.vga_stride);
+	printf("pagestride: %u ", v->page[0].stridew);
+	printf("draw_stride: %u ", vga_state.vga_draw_stride);
+	printf("draw_stride_limit: %u\n", vga_state.vga_draw_stride_limit);
+
+	if(v->vmem_remain)
+		printf("  Free Video Memory: %u\n", v->vmem_remain);
+	if(v->num_of_pages)
 	{
-		printf("	[%u]=", i);
-		printf("(%Fp)", (v->page[i].data));
-		printf(" size=%u	", v->page[i].pagesize);
-		printf("w=%-3lu  h=%-3lu ", (unsigned long)v->page[i].width, (unsigned long)v->page[i].height);
-		printf("sw=%-3lu  sh=%-3lu ", (unsigned long)v->page[i].sw, (unsigned long)v->page[i].sh);
-		printf("pi=%u", v->page[i].pi);
-		printf("\n");
+	printf("  page");
+		for(i=0; i<v->num_of_pages;i++)
+		{
+			printf("	[%u]=", i);
+			printf("(%Fp)", (v->page[i].data));
+			printf(" size=%u	", v->page[i].pagesize);
+			printf("w=%-3lu  h=%-3lu ", (unsigned long)v->page[i].width, (unsigned long)v->page[i].height);
+			printf("sw=%-3lu  sh=%-3lu ", (unsigned long)v->page[i].sw, (unsigned long)v->page[i].sh);
+			printf("pi=%u", v->page[i].pi);
+			printf("\n");
+		}
 	}
 }