From: sparky4 <sparky4@cock.li>
Date: Thu, 13 Apr 2017 20:12:13 +0000 (-0500)
Subject: p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=320be82ab5e414d1b771b295403218b614ed9d13;p=proj16%2F16.git

p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I should remember what needs to be done soon][OpenVGMFile needs to be ported to 16_snd.c]going to port rest of code to borland c some time so we can use the core components of id engine here [going to add 16_us.c eventually but the debug system and CA_ PM_ and MM_ usage is priority now]older zcroll renamed to xcroll][zcroll is now the pre menu game loop system with PROPER data usage with CAMMPM] MM_ShowMemory is quite buggy on real machines. i need to debug it and fix added a struct printer[gvar.mm is FUCKING HUGE 14402 bytes FAT\!]16_rf now compiles BT UNKNOWN ON WHAT IT DOSE\! text box creates a ghost because page 1 do not have bg info thus it is stored and saved.... wwww fizzfade being worked on and no idea how to make it work...
---

diff --git a/NO_NAME.GIF b/NO_NAME.GIF
deleted file mode 100755
index a2bb4e90..00000000
Binary files a/NO_NAME.GIF and /dev/null differ
diff --git a/data/G.PAL b/data/G.PAL
index 9e8a2ed5..bdc3b00c 100755
Binary files a/data/G.PAL and b/data/G.PAL differ
diff --git a/src/bakapi.c b/src/bakapi.c
index 3a9c7469..423e60e2 100755
--- a/src/bakapi.c
+++ b/src/bakapi.c
@@ -27,10 +27,15 @@
  */
 static bakapee_t bakapee;
 word key,d,xpos,ypos,xdir,ydir;
-sword vgamodex_mode = 1; // 320x240 default
+sword vgamodex_mode = 1; //	1 = 320x240 with buffer
 void TL_VidInit(global_game_variables_t *gvar){}
 //int ch=0x0;
 
+#define SETUPPAGEBAKAPI \
+gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0], &gvar.video); \
+gvar.video.page[1] = modexNextPage(&gvar.video.page[0]);
+
+
 void
 main(int argc, char *argvar[])
 {
@@ -40,6 +45,7 @@ main(int argc, char *argvar[])
 	int i;
 	word panq=1, pand=0;
 	boolean panswitch=0;
+	word	showpage=0;
 
 	ggvv=&gvar;
 
@@ -128,21 +134,23 @@ main(int argc, char *argvar[])
 	}
 
 	/* setup camera and screen~ */
-	gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);
-	gvar.video.page[1] = modexNextPage(&gvar.video.page[0]);
+	SETUPPAGEBAKAPI
 
 	//modexPalUpdate(bmp.palette); //____
 	//modexDrawBmp(VGA, 0, 0, &bmp, 0); //____
 	//getch(); //____
+	VL_SetLineWidth (40, &gvar);
 
-	VL_ShowPage(&gvar.video.page[0], 0, 0);
+	VL_ShowPage(&gvar.video.page[showpage], 0, 0);
 	{
 		word w;
 		for(w=0;w<64000;w++)
 		{
+			ding(&gvar.video.page[showpage], &bakapee, 4);
 			ding(&gvar.video.page[1], &bakapee, 4);
 		}
-		if(!baka_FizzleFade (&gvar.video.page[1], &gvar.video.page[0], 70, true, &gvar))
+		if(!baka_FizzleFade (gvar.video.ofs.bufferofs, gvar.video.ofs.displayofs, vga_state.vga_width, vga_state.vga_height, 70, true, &gvar))
+		//ding(&gvar.video.page[showpage], &bakapee, 9);
 		modexprint(&gvar.video.page[0], gvar.video.page[0].sw/2, gvar.video.page[0].sh/2, 1, 0, 47, 0, 1, "bakapi ok");
 	}
 	while(!kbhit()){}
@@ -162,8 +170,8 @@ main(int argc, char *argvar[])
 				}else c=getch();
 			}
 
-			if(!panswitch)	ding(&gvar.video.page[0], &bakapee, 2);
-			else			ding(&gvar.video.page[0], &bakapee, 9);
+			if(!panswitch)	ding(&gvar.video.page[0], &bakapee, key);
+			else			ding(&gvar.video.page[0], &bakapee, 2);
 			if(panswitch!=0)
 			{
 				//right movement
@@ -255,17 +263,18 @@ main(int argc, char *argvar[])
 					printf("on.	");
 				break;
 			}
-			//printf("\n");
 			printf("Pan mode is ");
 			switch (panswitch)
 			{
 				case 0:
-					printf("off.\n");
+					printf("off.");
 				break;
 				case 1:
-					printf("on.\n");
+					printf("on.");
 				break;
 			}
+			printf(" Showing page %u", showpage);
+			printf("\n");
 			printf("Incrementation of color happens at every %uth plot.\n", bakapee.bonk);
 			printf("Enter 1, 2, 3, 4, 5, 6, 8, or 9 to run a screensaver, or enter 0 to quit.\n");
 pee:
@@ -298,7 +307,19 @@ pee:
 						break;
 					}
 					key=0;
-					break;
+				break;
+				case 'q':
+					switch (showpage)
+					{
+						case 0:
+							showpage=1;
+						break;
+						case 1:
+							showpage=0;
+						break;
+					}
+					key=0;
+				break;
 				case '8':
 					c+=8;
 				case '1':
@@ -310,11 +331,11 @@ pee:
 				case '9':
 					key = c - '0';
 					VGAmodeX(vgamodex_mode, 0, &gvar);
-					gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);
-					gvar.video.page[1] = modexNextPage(&gvar.video.page[1]);
+					VL_ShowPage(&gvar.video.page[showpage], 0, 0);
+					SETUPPAGEBAKAPI
 		// this code is written around modex16 which so far is a better fit than using DOSLIB vga directly, so leave MXLIB code in.
 		// we'll integrate DOSLIB vga into that part of the code instead for less disruption. -- J.C.
-					VL_ShowPage(&gvar.video.page[0], 0, 0);
+					VL_ShowPage(&gvar.video.page[showpage], 0, 0);
 					break;
 				case '-':
 					if(bakapee.bonk>0)
@@ -327,9 +348,9 @@ pee:
 				break;
 				default:
 					key=0;
-					clrscr();	//added to clear screen wwww
 				break;
 			}
+			clrscr();	//added to clear screen wwww
 		}
 	}
 #if 0
diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index ab517893..2f032490 100755
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1266,7 +1266,7 @@ void MM_ShowMemory(global_game_variables_t *gvar)
 	sdword	end,owner;
 	byte    scratch[160],scratch0[4096],str[16];
 
-	VL_SetLineWidth(40, &gvar->video.ofs);
+	VL_SetLineWidth(40, gvar);
 	temp = gvar->video.ofs.bufferofs;
 	gvar->video.ofs.bufferofs = gvar->video.ofs.displayofs;
 	scan = gvar->mm.mmhead;
diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c
index d664b28d..ce2733d3 100755
--- a/src/lib/16_tail.c
+++ b/src/lib/16_tail.c
@@ -26,8 +26,6 @@
 #include "src/lib/16_tail.h"
 #include "src/lib/16text.h"
 
-static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
-
 /*
 ==========================
 =
@@ -247,68 +245,53 @@ void Shutdown16(global_game_variables_t *gvar)
 
 #define PIXPERFRAME     1600
 
-void FizzleFade (unsigned source, unsigned dest,
-	unsigned width,unsigned height, boolean abortable, global_game_variables_t *gv)
+boolean FizzleFade (unsigned source, unsigned dest, unsigned width, unsigned height, unsigned frames, boolean abortable, global_game_variables_t *gvar)
 {
-	unsigned        drawofs,pagedelta;
-	unsigned        char maskb[8] = {1,2,4,8,16,32,64,128};
-	unsigned        x,y,p,frame;
-	long            rndval;
-	word TimeCount = *clockw;
+	word		p,pixperframe;
+	unsigned	drawofs,pagedelta;
+	byte 		mask,maskb[8] = {1,2,4,8};
+	unsigned	x,y,frame		,esorig,q;
+	dword		rndval;
 	word screenseg = SCREENSEG;
 
 	pagedelta = dest-source;
-//++++	VL_SetScreen (dest,0);
-	rndval = 1;
+	rndval = 1;	esorig = 0; q = 16;
 	x = y = 0;
+	pixperframe = 76800/(dword)frames;
+
+	IN_StartAck (gvar);
 
 	__asm {
-		mov	es,[screenseg]
-		mov	dx,SC_INDEX
-		mov	al,SC_MAPMASK
-		out	dx,al
+		mov	[esorig],es
 	}
-
-	TimeCount=frame=0;
-	do      // while (1)
+	frame=0;
+	do	// while (1)
 	{
-		if (abortable)
-		{
-			IN_ReadControl(0,gv);
-			if (gv->player[0].info.button0 || gv->player[0].info.button1 || gv->in.inst->Keyboard[sc_Space]
-			|| gv->in.inst->Keyboard[sc_Enter])
-			{
-//++++				VW_ScreenToScreen (source,dest,width/8,height);
-				return;
-			}
+		if (abortable && IN_CheckAck (gvar) )
+			return true;
+
+		__asm {
+			mov	es,[screenseg]
 		}
 
-		for (p=0;p<PIXPERFRAME;p++)
+		for (p=0;p<pixperframe;p++)
 		{
-			//
-			// seperate random value into x/y pair
-			//
 			__asm {
+				//
+				// seperate random value into x/y pair
+				//
 				mov	ax,[WORD PTR rndval]
 				mov	dx,[WORD PTR rndval+2]
 				mov	bx,ax
 				dec	bl
-				mov	[BYTE PTR y],bl                 // low 8 bits - 1 = y xoordinate
+				mov	[BYTE PTR y],bl			// low 8 bits - 1 = y xoordinate
 				mov	bx,ax
 				mov	cx,dx
-				shr	cx,1
-				rcr	bx,1
-				shr	bx,1
-				shr	bx,1
-				shr	bx,1
-				shr	bx,1
-				shr	bx,1
-				shr	bx,1
-				shr	bx,1
-				mov	[x],bx                                  // next 9 bits = x xoordinate
-			//
-			// advance to next random element
-			//
+				mov	[BYTE PTR x],ah			// next 9 bits = x xoordinate
+				mov	[BYTE PTR x+1],dl
+				//
+				// advance to next random element
+				//
 				shr	dx,1
 				rcr	ax,1
 				jnc	noxor
@@ -325,84 +308,39 @@ noxor:
 				mov	[WORD PTR rndval+2],dx
 			}
 
-			if (x>width || y>height)
+			if ((x>width || y>height) && (x<width*2 && y<height*2))
 				continue;
-			drawofs = source+gv->video.ofs.ylookup[y];
+			drawofs = source+(gvar->video.ofs.ylookup[y]) + (x>>2);
+
+			//
+			// copy one pixel
+			//
+//*
+			mask = x&3;
+			VGAREADMAP(mask);
+			mask = maskb[mask];
+			VGAMAPMASK(mask);
+//*/
+//			modexputPixel(&(gvar->video.page[0]), x, y, rand()%8);
+//			VL_Plot (x, y, 15, &(gvar->video.ofs));
 
 			__asm {
-				mov	cx,[x]
-				mov	si,cx
-				and	si,7
-				mov	dx,GC_INDEX
-				mov	al,GC_BITMASK
-				mov	ah,BYTE PTR [maskb+si]
-				out	dx,ax
-
-				mov	si,[drawofs]
-				shr	cx,1
-				shr	cx,1
-				shr	cx,1
-				add	si,cx
-				mov	di,si
+				mov	di,[drawofs]
+				mov	al,[es:di]
 				add	di,[pagedelta]
-
-				mov	dx,GC_INDEX
-				mov	al,GC_READMAP                   // leave GC_INDEX set to READMAP
-				out	    dx,al
-
-				mov	dx,SC_INDEX+1
-				mov	al,1
-				out	    dx,al
-				mov	dx,GC_INDEX+1
-				mov	al,0
-				out	    dx,al
-
-				mov	bl,[es:si]
-				xchg	[es:di],bl
-
-				mov	dx,SC_INDEX+1
-				mov	al,2
-				out	    dx,al
-				mov	dx,GC_INDEX+1
-				mov	al,1
-				out	    dx,al
-
-				mov	bl,[es:si]
-				xchg	[es:di],bl
-
-				mov	dx,SC_INDEX+1
-				mov	al,4
-				out	    dx,al
-				mov	dx,GC_INDEX+1
-				mov	al,2
-				out	    dx,al
-
-				mov	bl,[es:si]
-				xchg	[es:di],bl
-
-				mov	dx,SC_INDEX+1
-				mov	al,8
-				out	    dx,al
-				mov	dx,GC_INDEX+1
-				mov	al,3
-				out	    dx,al
-
-				mov	bl,[es:si]
-				xchg	[es:di],bl
+				mov	[es:di],al
 			}
 
 			if (rndval == 1)		// entire sequence has been completed
-			{
-				VGABITMASK(255);
-				VGAMAPMASK(15);
-				return;
-			}
+				return false;
 		}
 		frame++;
-		while (TimeCount<frame){}	// don't go too fast
+//--		while (TimeCount<frame){}//;		// don't go too fast
 	} while (1);
-
-
+	__asm {
+		mov	es,[esorig]
+	}
+	return false;
 }
 
 //===========================================================================
diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index 469c7a9f..7212da7f 100755
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -129,7 +129,7 @@ word modexPalOverscan(word col);
 void Shutdown16(global_game_variables_t *gvar);
 void Startup16(global_game_variables_t *gvar);
 void TL_VidInit(global_game_variables_t *gvar);
-void FizzleFade (unsigned source, unsigned dest,unsigned width,unsigned height, boolean abortable, global_game_variables_t *gv);
+boolean FizzleFade (unsigned source, unsigned dest, unsigned width, unsigned height, unsigned frames, boolean abortable, global_game_variables_t *gvar);
 void DebugMemory_(global_game_variables_t *gvar, boolean q);
 void ClearMemory (global_game_variables_t *gvar);
 void Quit (global_game_variables_t *gvar, char *error);
diff --git a/src/lib/16_tail_.c b/src/lib/16_tail_.c
index 3ab26f0b..2e680faf 100755
--- a/src/lib/16_tail_.c
+++ b/src/lib/16_tail_.c
@@ -24,6 +24,7 @@
  */
 
 #include "src/lib/16_tail.h"
+#include "src/lib/16_vl.h"
 
 void	TL_VidInit(global_game_variables_t *gvar)
 {
diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 341ada31..07807c20 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -398,6 +398,7 @@ typedef struct
 {
 	boolean	VL_Started,VL_Initiated;
 	char old_mode;		//old video mode before game!
+	sword curr_mode;		//modex curent mode
 	byte palette[PALSIZE], dpal[PALSIZE];	//palette array
 	page_t page[MAXPAGE];	//can be used as a pointer to root page[0]
 	word vmem_remain;	//remaining video memory
diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index be84166c..ceed6410 100755
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -282,14 +282,15 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 	switch(vq)
 	{
 		case 1:
+		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]);
 			}*/
-			/* width and height */
+			// width and height //
 			gv->video.page[0].sw = vga_state.vga_width = 320; // VGA lib currently does not update this
 			gv->video.page[0].sh = vga_state.vga_height = 240; // VGA lib currently does not update this
-			/* virtual width and height. match screen, at first */
+			// virtual width and height. match screen, at first //
 			gv->video.page[0].height = gv->video.page[0].sh;
 			gv->video.page[0].width = gv->video.page[0].sw;
 
@@ -319,7 +320,15 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 		case 2: // TODO: 160x120 according to ModeX_160x120regs
 			return;
 		case 3: // TODO: 160x120 according to ModeX_320x200regs
-			return;
+			gv->video.page[0].sw = vga_state.vga_width = 300; // VGA lib currently does not update this
+			gv->video.page[0].sh = vga_state.vga_height = 200; // VGA lib currently does not update this
+			// virtual width and height. match screen, at first //
+			gv->video.page[0].height = gv->video.page[0].sh;
+			gv->video.page[0].width = gv->video.page[0].sw;
+
+			cm.offset = (vga_state.vga_width / (4 * 2)); // 320 wide (40 x 4 pixel groups x 2)
+			//return;
+		break;
 		case 4: // TODO: 160x120 according to ModeX_192x144regs
 			return;
 		case 5: // TODO: 160x120 according to ModeX_256x192regs
@@ -350,7 +359,8 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 		}
 		break;
 	}
-	VL_SetLineWidth (cm.offset, &gv->video.ofs);
+	VL_SetLineWidth (cm.offset, gv);
+	gv->video.curr_mode=vq;
 	gv->video.VL_Started=1;
 }
 
@@ -360,6 +370,7 @@ void modexLeave(void)
 	VL_vgaSetMode(TEXT_MODE);
 }
 
+#if 0
 page_t
 modexDefaultPage(page_t *p)
 {
@@ -373,8 +384,46 @@ modexDefaultPage(page_t *p)
 	page.dy = 0;
 	page.sw = p->sw;
 	page.sh = p->sh;
-	page.width = p->sw+TILEWHD;
-	page.height = p->sh+TILEWHD;
+	page.width = p->sw;
+	page.height = p->sh;
+	page.ti.tw = page.sw/TILEWH;
+	page.ti.th = page.sh/TILEWH;
+	page.ti.tilesw=page.width/TILEWH;
+	page.ti.tilesh=page.height/TILEWH;
+	page.ti.tilemidposscreenx = page.ti.tw/2;
+	page.ti.tilemidposscreeny = (page.ti.th/2)+1;
+	page.stridew=page.width/4;
+	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;
+}
+#endif
+page_t
+modexDefaultPage(page_t *p, video_t *v)
+{
+	page_t page;
+
+	/* default page values */
+	//page.data = VGA;
+	//page.data = (byte far *)(vga_state.vga_graphics_ram);
+	page.data = (vga_state.vga_graphics_ram);
+	page.dx = 0;
+	page.dy = 0;
+	page.sw = p->sw;
+	page.sh = p->sh;
+	page.width = p->sw;
+	page.height = p->sh;
+	if(v->curr_mode == 1)
+{	page.width += TILEWHD;
+	page.height += TILEWHD; }
 	page.ti.tw = page.sw/TILEWH;
 	page.ti.th = page.sh/TILEWH;
 	page.ti.tilesw=page.width/TILEWH;
@@ -477,7 +526,7 @@ void modexHiganbanaPageSetup(video_t *video)
 {
 	video->vmem_remain=65535U;
 	video->num_of_pages=0;
-	(video->page[0]) = modexDefaultPage(&(video->page[0]));	video->num_of_pages++;	//video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD);
+	(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++;
@@ -878,7 +927,7 @@ modexLoadPalFile(byte *filename, byte *palette) {
 
 void VL_LoadPalFile(const char *filename, byte *palette, global_game_variables_t *gvar)
 {
-	VL_LoadPalFilewithoffset(filename, palette, 8, gvar);
+	VL_LoadPalFilewithoffset(filename, palette, 9, gvar);
 //	VL_LoadPalFileCore(palette);
 }
 
diff --git a/src/lib/16_vl.h b/src/lib/16_vl.h
index a152cc35..519b1026 100755
--- a/src/lib/16_vl.h
+++ b/src/lib/16_vl.h
@@ -173,7 +173,7 @@ byte VL_vgaGetMode(void);
 extern void TL_VidInit(global_game_variables_t *gvar);
 void modexLeave(void);
 void modexsetBaseXMode();
-page_t modexDefaultPage(page_t *p);
+page_t modexDefaultPage(page_t *p, video_t *v);
 page_t modexNextPage(page_t *p);
 page_t modexNextPageFlexibleSize(page_t *p, word x, word y);
 void modexCalcVmemRemain(video_t *video);
@@ -258,7 +258,7 @@ void modexWaitBorder();
 void modexWaitBorder_start();
 void modexWaitBorder_end();
 void VL_WaitVBL(word num);
-void VL_SetLineWidth (unsigned width, ofs_t *ofs);
+void VL_SetLineWidth (unsigned width, global_game_variables_t *gvar);
 void VL_PrintmodexmemInfo(video_t *v);
 
 #endif
diff --git a/src/lib/16_vl_1.c b/src/lib/16_vl_1.c
index 7332d5fb..6956717e 100755
--- a/src/lib/16_vl_1.c
+++ b/src/lib/16_vl_1.c
@@ -169,7 +169,7 @@ SetScreen_done:
 ====================
 */
 
-void VL_SetLineWidth (unsigned width, ofs_t *ofs)
+void VL_SetLineWidth (unsigned width, global_game_variables_t *gvar)
 {
 	int i,offset;
 
@@ -181,15 +181,17 @@ void VL_SetLineWidth (unsigned width, ofs_t *ofs)
 //
 // set up lookup tables
 //
-	ofs->linewidth = width*2;
+	gvar->video.ofs.linewidth = width*2;
 
 	offset = 0;
 
 	for	(i=0;i<MAXSCANLINES;i++)
 	{
-		ofs->ylookup[i]=offset;
-		offset += ofs->linewidth;
+		gvar->video.ofs.ylookup[i]=offset;
+		offset += gvar->video.ofs.linewidth;
 	}
+	gvar->video.ofs.displayofs = 0;
+	gvar->video.ofs.bufferofs = gvar->video.page[0].width*gvar->video.page[0].height;//gvar->video.page[0].pagesize;
 }
 
 /*
diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c
index cf1dd904..0174d3c3 100755
--- a/src/lib/bakapee.c
+++ b/src/lib/bakapee.c
@@ -43,28 +43,42 @@ char global_temp_status_text2[512];
 #define PIXPOSX			gvar->video.page[0].sw/2
 #define PIXPOSY			gvar->video.page[0].sh/2
 
-boolean baka_FizzleFade (page_t *source, page_t *dest, unsigned frames, boolean abortable, global_game_variables_t *gvar)
+/*
+===================
+=
+= FizzleFade
+=
+= returns true if aborted
+=
+===================
+*/
+
+//extern	ControlInfo	c;
+#define PIXPOSX			gvar->video.page[0].sw/2
+#define PIXPOSY			gvar->video.page[0].sh/2
+
+boolean baka_FizzleFade (unsigned source, unsigned dest, unsigned width, unsigned height, unsigned frames, boolean abortable, global_game_variables_t *gvar)
 {
-	dword		p,pixperframe;
+	word		p,pixperframe;
 	unsigned	drawofs,pagedelta;
 	byte 		mask,maskb[8] = {1,2,4,8};
-	unsigned	x,y,frame		,esorig;
+	unsigned	x,y,frame		,esorig,q;
 	dword		rndval;
-//	word TimeCount = *clockw;
 	word screenseg = SCREENSEG;
 
-	pagedelta = (word)dest->sw*dest->sh;//(word)(source->data - dest->data);//(dest->data - source->data)
-	rndval = 1;	esorig = 0;
-	x = y = dest->dx;
-	pixperframe = 76800/(dword)frames;
+	pagedelta = dest-source;
+	rndval = 1;	esorig = 0; q = 16;
+	x = y = 0;//destpage->dx;
+	pixperframe = /*76800*/64000/(dword)frames;
 
 //	IN_StartAck ();
 
-//	VL_ShowPage(dest, 1, 0);
-//	VL_ShowPage(source, 1, 0);
+//	VL_ShowPage(&(gvar->video.page[0]), 1, 0);
+//	VL_ShowPage(&(gvar->video.page[1]), 1, 0);
 
-//	modexClearRegion(dest, 0, 0, (dest->width), (dest->height), 12);
-	modexClearRegion(source, 0, 0, (source->width), (source->height), 64);
+//	modexClearRegion(&(gvar->video.page[0]), 0, 0, gvar->video.page[0].width, gvar->video.page[0].height, 0);
+//	modexClearRegion(&(gvar->video.page[1]), 0, 0, gvar->video.page[0].width, gvar->video.page[0].height, 15);
+//	VL_SetLineWidth(80, gvar);
 
 	__asm {
 		mov	[esorig],es
@@ -74,7 +88,7 @@ boolean baka_FizzleFade (page_t *source, page_t *dest, unsigned frames, boolean
 	do	// while (1)
 	{
 sprintf(global_temp_status_text, "%u", frame);
-modexprint(dest, PIXPOSX, PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text);
+modexprint(&(gvar->video.page[0]), PIXPOSX, PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text);
 		if (abortable && kbhit())//IN_CheckAck () )
 			return true;
 
@@ -116,25 +130,31 @@ noxor:
 				mov	[WORD PTR rndval+2],dx
 			}
 
-			if (x>dest->sw || y>dest->sh)
+//			if (x>destpage->width || y>destpage->height)
+//			if (x<destpage->sw || y<destpage->sh)
+			if ((x>width || y>height) && (x<width*2 && y<height*2))
 				continue;
-			drawofs = (word)(source->data)+gvar->video.ofs.ylookup[y] + (x>>2);
+			drawofs = source+(gvar->video.ofs.ylookup[y]) + (x>>2);
 sprintf(global_temp_status_text, "draw - %Fp", drawofs);
-modexprint(dest, PIXPOSX, 16+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text);
+modexprint(&(gvar->video.page[0]), PIXPOSX, q+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text); q+=8;
 sprintf(global_temp_status_text, "pdet - %Fp", pagedelta);
-modexprint(dest, PIXPOSX, 24+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text);
-sprintf(global_temp_status_text, "srce - %Fp", source->data);
-modexprint(dest, PIXPOSX, 32+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text);
-sprintf(global_temp_status_text, "dest - %Fp", dest->data);
-modexprint(dest, PIXPOSX, 40+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text);
+modexprint(&(gvar->video.page[0]), PIXPOSX, q+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text); q+=8;
+sprintf(global_temp_status_text, "srce - %Fp", source);
+modexprint(&(gvar->video.page[0]), PIXPOSX, q+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text); q+=8;
+sprintf(global_temp_status_text, "dest - %Fp", dest);
+modexprint(&(gvar->video.page[0]), PIXPOSX, q+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text); q=16;
 
 			//
 			// copy one pixel
 			//
+//*
 			mask = x&3;
 			VGAREADMAP(mask);
 			mask = maskb[mask];
 			VGAMAPMASK(mask);
+//*/
+//			modexputPixel(&(gvar->video.page[0]), x, y, rand());
+//			VL_Plot (x, y, 15, &(gvar->video.ofs));
 
 			__asm {
 				mov	di,[drawofs]
@@ -154,31 +174,43 @@ modexprint(dest, PIXPOSX, 40+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text);
 	}
 	return false;
 }
+
 #if 0
-boolean baka_FizzleFade (unsigned source, unsigned dest, unsigned width,unsigned height, unsigned frames, boolean abortable, global_game_variables_t *gvar)
+boolean baka_FizzleFade (page_t *sourcepage, page_t *destpage, unsigned width, unsigned height, unsigned frames, boolean abortable, global_game_variables_t *gvar)
 {
-	int			pixperframe;
+	word		p,pixperframe;
 	unsigned	drawofs,pagedelta;
 	byte 		mask,maskb[8] = {1,2,4,8};
-	unsigned	x,y,p,frame;
+	unsigned	x,y,frame		,esorig,q;
 	dword		rndval;
-	word TimeCount = *clockw;
+	unsigned	source,dest;
+//	word TimeCount = *clockw;
 	word screenseg = SCREENSEG;
+	source = ((word)sourcepage->data); dest = ((word)destpage->data);
 
-	pagedelta = dest-source;
-	rndval = 1;
-	x = y = 0;
-	pixperframe = 64000/frames;
+	pagedelta = dest-source;//(word)(source->data - dest->data);//(dest->data - source->data)
+	rndval = 1;	esorig = 0; q = 16;
+	x = y = destpage->dx;
+	pixperframe = /*76800*/64000/(dword)frames;
 
-	VGAmodeX(0, 0, gvar);
 //	IN_StartAck ();
-//	VL_ShowPage((page_t *)dest, 1, 0);
-	VGAmodeX(1, 0, gvar);
 
-	TimeCount=frame=0;
+//	VL_ShowPage(destpage, 1, 0);
+//	VL_ShowPage(sourcepage, 1, 0);
+
+//	modexClearRegion(destpage, 0, 0, (destpage->width), (destpage->height), 12);
+	modexClearRegion(sourcepage, 0, 0, (sourcepage->width), (sourcepage->height), 64);
+
+	__asm {
+		mov	[esorig],es
+	}
+//	TimeCount=
+	frame=0;
 	do	// while (1)
 	{
-		if (abortable && !kbhit())//IN_CheckAck () )
+sprintf(global_temp_status_text, "%u", frame);
+modexprint(destpage, PIXPOSX, PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text);
+		if (abortable && kbhit())//IN_CheckAck () )
 			return true;
 
 		__asm {
@@ -191,31 +223,51 @@ boolean baka_FizzleFade (unsigned source, unsigned dest, unsigned width,unsigned
 				//
 				// seperate random value into x/y pair
 				//
-					mov	ax,[WORD PTR rndval]
-					mov	dx,[WORD PTR rndval+2]
-					mov	bx,ax
-					dec	bl
-					mov	[BYTE PTR y],bl			// low 8 bits - 1 = y xoordinate
-					mov	bx,ax
-					mov	cx,dx
-					mov	[BYTE PTR x],ah			// next 9 bits = x xoordinate
-					mov	[BYTE PTR x+1],dl
+				mov	ax,[WORD PTR rndval]
+				mov	dx,[WORD PTR rndval+2]
+				mov	bx,ax
+				dec	bl
+				mov	[BYTE PTR y],bl			// low 8 bits - 1 = y xoordinate
+				mov	bx,ax
+				mov	cx,dx
+				mov	[BYTE PTR x],ah			// next 9 bits = x xoordinate
+				mov	[BYTE PTR x+1],dl
 				//
 				// advance to next random element
 				//
-					shr	dx,1
-					rcr	ax,1
-					jnc	noxor
-					xor	dx,0x0001
-					xor	ax,0x2000
+				shr	dx,1
+				rcr	ax,1
+				jnc	noxor
+				xor	dx,0x0001
+				xor	ax,0x2000
+#ifdef __BORLANDC__
+			}
+#endif
 noxor:
-					mov	[WORD PTR rndval],ax
-					mov	[WORD PTR rndval+2],dx
+#ifdef __BORLANDC__
+			__asm {
+#endif
+				mov	[WORD PTR rndval],ax
+				mov	[WORD PTR rndval+2],dx
 			}
 
+//			if (x>destpage->width || y>destpage->height)
+//			if (x<destpage->sw || y<destpage->sh)
 			if (x>width || y>height)
 				continue;
-			drawofs = source+gvar->video.ofs.ylookup[y] + (x>>2);
+			drawofs = source+(gvar->video.ofs.ylookup[y]) + (x>>2);
+sprintf(global_temp_status_text, "draw - %Fp", drawofs);
+modexprint(destpage, PIXPOSX, q+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text); q+=8;
+sprintf(global_temp_status_text, "pdet - %Fp", pagedelta);
+modexprint(destpage, PIXPOSX, q+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text); q+=8;
+sprintf(global_temp_status_text, "srcp - %Fp", sourcepage->data);
+modexprint(destpage, PIXPOSX, q+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text); q+=8;
+sprintf(global_temp_status_text, "desp - %Fp", destpage->data);
+modexprint(destpage, PIXPOSX, q+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text); q+=8;
+sprintf(global_temp_status_text, "srce - %Fp", source);
+modexprint(destpage, PIXPOSX, q+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text); q+=8;
+sprintf(global_temp_status_text, "dest - %Fp", dest);
+modexprint(destpage, PIXPOSX, q+PIXPOSY, 1, 0, 47, 0, 1, global_temp_status_text); q=16;
 
 			//
 			// copy one pixel
@@ -236,8 +288,11 @@ noxor:
 				return false;
 		}
 		frame++;
-//		while (TimeCount<frame){}//;		// don't go too fast
+//--		while (TimeCount<frame){}//;		// don't go too fast
 	} while (1);
+	__asm {
+		mov	es,[esorig]
+	}
 	return false;
 }
 #endif
@@ -518,7 +573,7 @@ void ding(page_t *page, bakapee_t *pee, word q)
 			modexprint(page, page->sw/2, page->sh/2, 1, 0, 47, 0, 1, "bakapi");
 		break;
 		case 9:
-			//baka_FizzleFade (ggvv->video.ofs.bufferofs, ggvv->video.ofs.displayofs, page->sw, page->sh, false, ggvv);
+			baka_FizzleFade (ggvv->video.ofs.bufferofs, ggvv->video.ofs.displayofs, vga_state.vga_width, vga_state.vga_height, 70, true, ggvv);
 //			modexprint(page, page->sw/2, page->sh/2, 1, 0, 47, 0, 1, "bakapi start");
 //			if(!baka_FizzleFade ((unsigned)page, (unsigned)page, page->width, page->height, 70, false, ggvv))
 		break;
diff --git a/src/lib/bakapee.h b/src/lib/bakapee.h
index 08af061b..d39a97e8 100755
--- a/src/lib/bakapee.h
+++ b/src/lib/bakapee.h
@@ -41,7 +41,7 @@ typedef struct {
 	word bonk,lgq,hgq;
 } bakapee_t;
 
-boolean baka_FizzleFade (page_t *source, page_t *dest, unsigned frames, boolean abortable, global_game_variables_t *gvar);
+boolean baka_FizzleFade (unsigned source, unsigned dest, unsigned width, unsigned height, unsigned frames, boolean abortable, global_game_variables_t *gvar);
 void clrstdin();
 void colortest(page_t *page, bakapee_t *pee);
 void colorz(page_t *page, bakapee_t *pee);
diff --git a/src/palbomb.c b/src/palbomb.c
index 80b9a9f5..61f55918 100755
--- a/src/palbomb.c
+++ b/src/palbomb.c
@@ -26,7 +26,7 @@ void main(int argc, char *argv[]) {
 
 	TL_VidInit(&gvar);	VGAmodeX(1, 0, &gvar);
 
-	gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);
+	gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0], &gvar.video);
 	VL_ShowPage(&gvar.video.page[0], 1, 0);
 	modexpdump(&gvar.video.page[0]);
 	while(!kbhit()){ VL_modexPalScramble(&gvar.video.palette); }
diff --git a/src/palettec.c b/src/palettec.c
index f221d837..9e6bc2b6 100755
--- a/src/palettec.c
+++ b/src/palettec.c
@@ -26,7 +26,7 @@ void main(int argc, char *argv[]) {
 
 	TL_VidInit(&gvar);	VGAmodeX(1, 0, &gvar);
 	modexSavePalFile(bakapee, &gvar.video.palette);
-	gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);// modexFadeOn(4, &gvar.video.palette);
+	gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0], &gvar.video);// modexFadeOn(4, &gvar.video.palette);
 	VL_ShowPage(&gvar.video.page[0], 1, 0);
 	modexpdump(&gvar.video.page[0]);
 	while(!kbhit()){ /*VL_modexPalScramble(&gvar.video.palette);*/ }
diff --git a/src/palettel.c b/src/palettel.c
index 3fdcf5a5..303dbf9d 100755
--- a/src/palettel.c
+++ b/src/palettel.c
@@ -27,7 +27,7 @@ void main(int argc, char *argv[])
 
 	TL_VidInit(&gvar);	VGAmodeX(1, 0, &gvar);
 	VL_LoadPalFile(bakapee, &gvar.video.palette, &gvar);		//modexLoadPalFile(bakapee, &(gvar.video.palette));
-	gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);// modexFadeOn(4, &gvar.video.palette);
+	gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0], &gvar.video);// modexFadeOn(4, &gvar.video.palette);
 	VL_ShowPage(&gvar.video.page[0], 1, 0);
 	modexpdump(&gvar.video.page[0]);
 	while(!kbhit()){ /*VL_modexPalScramble(&gvar.video.palette);*/ }