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

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index ec88898e..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);
 }
 
@@ -545,6 +546,9 @@ void modexHiganbanaPageSetup(global_game_variables_t *gvar)
 		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;
 }
 
 //
@@ -916,6 +920,8 @@ modexLoadPalFile(byte *filename, byte *palette) {
 	fclose(file);
 }
 
+#define COREPALSIZE 9//27	//3*9
+
 void VLL_LoadPalFilewithoffset(const char *filename, byte *palette, word o, word palsize, global_game_variables_t *gvar)
 {
 	int fd;
@@ -923,36 +929,51 @@ void VLL_LoadPalFilewithoffset(const char *filename, byte *palette, word o, word
 
 	fd = open(filename,O_RDONLY|O_BINARY);
 	if (fd >= 0) {
-		read(fd,palette,	palsize);
+		read(fd,palette,	palsize*3);
 		close(fd);
 
-		if(palsize==27) newpalette = palette; else{	//if core then load it
+		if(palsize==COREPALSIZE) newpalette = palette; else{	//if core then load it
 		newpalette = &palette[3];			//skip overscan color
 		if(!o) o++;
 		}
-		VL_UpdatePaletteWrite(newpalette, o, gvar);
+		VL_UpdatePaletteWrite(newpalette, o, palsize, gvar);
 	}
 }
 
+//++++//
+void VL_SetCorePal(global_game_variables_t *gvar)
+{
+	byte *palette = &corepal;
+	word 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
-//		9,	//preserved core/system palette
-		PAL_SIZE, gvar);
+		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, 27, gvar);
+	VLL_LoadPalFilewithoffset("data/16.pal", palette, 0, COREPALSIZE, gvar);
 }
 
-void VL_UpdatePaletteWrite(byte *palette, word o, global_game_variables_t *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 < 255-o;i++)
+	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);
@@ -1263,6 +1284,12 @@ 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(nibble pagenum, global_game_variables_t *gvar)
 {
@@ -1387,7 +1414,8 @@ 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("  stride: %u ", vga_state.vga_stride);
+	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);