X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=fa6df24b88708ad4bcb7a34ed1a4b088041472f5;hb=eae4d66409e20e893ac6c407a908c08daafaf098;hp=b108a20d6fd7901e052f454e6b70f3fc4a4082ef;hpb=9fae6d1ef0ebd44690958e072f400edde9262208;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index b108a20d..fa6df24b 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -91,13 +91,14 @@ void main(int argc, char *argv[])
 #endif
 	}
 	_DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log
+	_DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);
 
 	pan.pn=1;
 	//player[0].data = &pp;
 
-	printf("starting timer	");
+	//printf("starting timer	");
 	start_timer(&gvar);
-	printf("ok\n");
+	//printf("ok\n");
 
 //	atexit(qclean());
 
@@ -176,6 +177,7 @@ void main(int argc, char *argv[])
 		mv[i].video = &gvar.video;
 		mv[i].pan	= &pan;
 	}
+
 	/* set up paging */
 	//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
 	mapGoTo(mv, 0, 0);
@@ -189,6 +191,7 @@ void main(int argc, char *argv[])
 	//IN_initplayer(&player, 1);
 
 #ifndef	SPRITE
+	modexClearRegion(mv[0].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
 	modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
 #else
 	//PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,	PLAYERBMPDATA);
@@ -198,7 +201,22 @@ void main(int argc, char *argv[])
 	if(!pageflipflop)	modexShowPage(mv[1].page);
 	else			modexShowPage(mv[(gvar.video.p)].page);
 		shinku_fps_indicator_page = 1; // we're on page 1 now, shinku(). follow along please or it will not be visible.
-	//modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
+
+	/* buffer pages */
+// 	modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 47);
+// 	modexClearRegion(mv[3].page, 0, 0, mv[3].page->width, mv[3].page->height, 45);
+	{
+		unsigned int k,j,o;
+		/* fill screen with a distinctive pattern */
+		for (k=0;k < vga_state.vga_width;k++) {
+			o = k >> 2;
+			vga_write_sequencer(0x02/*map mask*/,1 << (k&3));
+				for (j=0;j < vga_state.vga_height;j++,o += vga_state.vga_stride)
+					vga_state.vga_graphics_ram[o] = (k^j)&15; // VRL samples put all colors in first 15!
+		}
+	}
+	modexClearRegion(mv[3].page, 0, 128, 28, 36, 15);
+
 #ifdef MODEX
 #ifdef FADE
 	modexFadeOn(4, gpal);
@@ -220,7 +238,6 @@ void main(int argc, char *argv[])
 		//printf("	player[0].q: %d", player[0].q);	printf("	player[0].d: %d\n", player[0].d);
 	}
 
-
 	//the scripting stuff....
 	//if(((player[0].triggerx == TRIGGX && player[0].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
 	if(((mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
@@ -239,26 +256,27 @@ void main(int argc, char *argv[])
 	if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; }
 	if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; }
 	if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page);
-		//IN_Ack();
+		 IN_UserInput(1,1);
 	}	//p
 #ifdef MODEX
 #ifdef FADE
-	if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page); }
+	if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); }
 	if(IN_KeyDown(22)){
 	paloffset=0; modexPalBlack(); modexPalUpdate(&player[0].data, &paloffset, 0, 0);
 	printf("1paloffset	=	%d\n", paloffset/3);
 	 modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
 	printf("2paloffset	=	%d\n", paloffset/3);
-	 modexpdump(mv[0].page); modexpdump(mv[1].page); }
+	 modexpdump(mv[0].page); modexpdump(mv[1].page);
+		IN_UserInput(1,1);
+	}
 #endif
 #endif
 	//pan switch
-	if(IN_KeyDown(88)){panswitch=!panswitch;}	//f12
-	//TSR
+	if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);}	//f12
 	if(IN_KeyDown(87))	//f11
 	{
 		pageflipflop=!pageflipflop;
-		//IN_Ack();
+		IN_UserInput(1,1);
 // 		VGAmodeX(0, 0, &gvar);
 // 		IN_Shutdown();
 // 		__asm
@@ -267,10 +285,26 @@ void main(int argc, char *argv[])
 // 			int 21h
 // 		}
 	}
-	if(IN_KeyDown(68))	//s
+	if(IN_KeyDown(68))	//f10
 	{
 		gvar.kurokku.fpscap=!gvar.kurokku.fpscap;
-		//IN_Ack();
+		switch(gvar.kurokku.fpscap)
+		{
+			case 0:
+				gvar.kurokku.frames_per_second=1;
+			break;
+			case 1:
+				gvar.kurokku.frames_per_second=60;
+			break;
+		}
+		IN_UserInput(1,1);
+	}
+	if(IN_KeyDown(67))	//f9
+	{
+// 		modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 47);
+// 		modexClearRegion(mv[3].page, 0, 0, mv[3].page->width, mv[3].page->height, 45);
+		modexClearRegion(mv[3].page, 0, 128, 28, 36, 15);
+		//IN_UserInput(1,1);
 	}
 	//TODO fmemtest into page
 	/*if(IN_KeyDown(4+1))	//4
@@ -281,8 +315,8 @@ void main(int argc, char *argv[])
 	}*/
 
 	//9
-	if(IN_KeyDown(10)){ modexPalOverscan(default_pal, rand()%56); modexPalUpdate1(default_pal); }
-	//if(IN_KeyDown(11)){ modexPalOverscan(default_pal, 15); }
+	if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(default_pal); IN_UserInput(1,1); }
+	//if(IN_KeyDown(11)){ modexPalOverscan(15); }
 	if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;	//incase things go out of sync!
 	}
 
@@ -297,31 +331,35 @@ void main(int argc, char *argv[])
 	VGAmodeX(0, 1, &gvar);
 #endif
 	IN_Shutdown();
-	printf("Project 16 scroll.exe. This is just a test file!\n");
+	printf("\n\n\n\nProject 16 scroll.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
-	printf("tx: %d\n", mv[0].tx);
+	printf("tx: %d	", mv[0].tx);
 	printf("ty: %d\n", mv[0].ty);
-	printf("player.x: %d", player[0].x); printf("		player.y: %d\n", player[0].y);
+	printf("player vars:\n");
+	printf("	x: %d", player[0].x); printf("	y: %d\n", player[0].y);
 	//if(player[0].hp==0) printf("%d wwww\n", player[0].y+8);
 	//else printf("\nplayer[0].y: %d\n", player[0].y);
-	printf("player.tx: %d", player[0].tx); printf("		player.ty: %d\n", player[0].ty);
-	printf("player.triggx: %d", player[0].triggerx); printf("	player.triggy: %d\n", player[0].triggery);
-	printf("player.hp: %d", (player[0].hp));	printf("	player.q: %d", player[0].q);	printf("	player.info.dir: %d", player[0].info.dir);	printf("	player.d: %d ", player[0].d);
-		printf("pdir=%d\n", player[0].pdir);
-	printf("tile data value at player trigger position: %d\n", mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))]);
+	printf("	tx: %d", player[0].tx); printf("	ty: %d\n", player[0].ty);
+	printf("	triggx: %d", player[0].triggerx); printf("	triggy: %d\n", player[0].triggery);
+	printf("	hp: %d", (player[0].hp));	printf("	q: %d", player[0].q);	printf("	player.info.dir: %d", player[0].info.dir);	printf("	player.d: %d ", player[0].d);
+		printf("	pdir=%d\n", player[0].pdir);
+	printf("tile data value at player trigger position: %d\n\n", mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))]);
 //	printf("palette offset:	%d\n", paloffset/3);
 //++++	printf("Total used: %zu\n", oldfreemem-GetFreeSize());
 //++++	printf("Total free: %zu\n", GetFreeSize());
 //not used now	printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");
 //not used now	printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
-	printf("Virtual Screen: %dx", gvar.video.page[0].width);	printf("%d\n", gvar.video.page[0].height);
+	printf("Virtual Screen: %dx", gvar.video.page[0].width);	printf("%d	", gvar.video.page[0].height);
 	printf("Screen: %dx", gvar.video.page[0].sw);	printf("%d\n", gvar.video.page[0].sh);
-	printf("virtual tile resolution: %dx", gvar.video.page[0].tilesw);	printf("%d\n", gvar.video.page[0].tilesh);
-	printf("tile resolution: %dx", gvar.video.page[0].tw);	printf("%d \n", gvar.video.page[0].th);
+	printf("virtual tile resolution: %dx", gvar.video.page[0].tilesw);	printf("%d	", gvar.video.page[0].tilesh);
+	printf("tile resolution: %dx", gvar.video.page[0].tw);	printf("%d\n", gvar.video.page[0].th);
 	printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx);	printf("%d\n", gvar.video.page[0].tilemidposscreeny);
 	modexprintmeminfo(&gvar.video);
-	printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf("	mv[%u].ty: %d	", pan.pn, mv[pan.pn].ty); printf("gvar.video.p=%u\n", gvar.video.p);
-	//printf("player[1].q: %d", player[1].q);	printf("	player[1].d: %d\n", player[1].d);
+	//printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf("	mv[%u].ty: %d	", pan.pn, mv[pan.pn].ty);
+	printf("gvar.video.p=%u ", gvar.video.p); printf("gvar.video.r=%u ", gvar.video.r);
+	printf("pageflipflop=%u\n", pageflipflop);
+	//0000printf("\ngvar.video.tickclk=%f\n", gvar.video.tickclk);
+	//0000printf("gvar.video.clk=%f", gvar.video.clk);
 	printf("\n");
 	//printf("map.width=%d	map.height=%d	map.data[0]=%d\n", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]);