From: sparky4 <sparky4@cock.li>
Date: Thu, 9 Jun 2016 16:35:38 +0000 (-0500)
Subject: whent back to copy page wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=56bcf103bed55fa9f8a4b21d523ced253263efe3;p=16.git

whent back to copy page wwww
---

diff --git a/pcx2vrl b/pcx2vrl
index bd947e55..3d9ac6e6 100755
Binary files a/pcx2vrl and b/pcx2vrl differ
diff --git a/pcxsscut b/pcxsscut
index 1deec74d..d743ac3b 100755
Binary files a/pcxsscut and b/pcxsscut differ
diff --git a/scroll.l16 b/scroll.l16
index e69de29b..c3e80861 100755
--- a/scroll.l16
+++ b/scroll.l16
@@ -0,0 +1,28 @@
+WARNING: Failed to initialize DEBUG output
+starting timer	ok
+index=4096
+chkmap ok	Project 16 scroll.exe. This is just a test file!
+version Jun  9 2016 11:32:02
+tx: 0
+ty: 0
+player.x: 160		player.y: 128
+player.tx: 10		player.ty: 8
+player.triggx: 10	player.triggy: 9
+player.hp: 4	player.q: 1	player.info.dir: 2	player.d: 2 pdir=0
+tile data value at player trigger position: 0
+Virtual Screen: 352x272
+Screen: 320x240
+virtual tile resolution: 22x17
+tile resolution: 20x15 
+middle tile position: 10x8
+video memory remaining: 65535
+page 	[0]=(a000:0000) size=23936	sw=320  sh=240  width=352  height=272
+	[1]=(a000:5d80) size=23936	sw=320  sh=240  width=352  height=272
+	[2]=(a000:bb00) size=1024	sw=64  sh=64  width=64  height=64
+	[3]=(a000:bf00) size=16640	sw=320  sh=208  width=320  height=208
+gvar.video.p=1 gvar.video.r=0 pageflipflop=1
+
+gvar.video.tickclk=1926.703247
+gvar.video.clk=0.000000
+
+detected CPU type: 386 or newer
diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 94a9d59f..748f2ddd 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -603,10 +603,10 @@ void mapGoTo(map_view_t *mv, int tx, int ty)
 		mapDrawWRow(&mv[0], tx-1, ty, py);
 	i+=mv->map->width - tx;
 	}
-	//modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
 	/* block copy pattern to where we will draw the sprite */
 	vga_setup_wm1_block_copy();
-	_fmemcpy(mv[1].page->data, mv[0].page->data, mv[0].page->pagesize);
+	//_fmemcpy(mv[1].page->data, mv[0].page->data, mv[0].page->pagesize);
+	modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
 	/* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */
 	vga_restore_rm0wm0();
 	modexCopyPageRegion(mv[3].page, mv[!(mv->video->p)].page, 0/**/, 0/**/, 0, 128, 28, 36);
@@ -792,10 +792,10 @@ void shinku(global_game_variables_t *gv)
 	}
 	if(pageflipflop){
 	if(gv->video.r){
-		//modexCopyPageRegion(&(gv->video.page[(gv->video.p)]), &(gv->video.page[(!gv->video.p)]), 0, 0, 0, 0, gv->video.page[gv->video.p].width, gv->video.page[!gv->video.p].height);
 		/* block copy pattern to where we will draw the sprite */
 		vga_setup_wm1_block_copy();
-		_fmemmove((gv->video.page[(gv->video.p)]).data, (gv->video.page[(!gv->video.p)]).data, gv->video.page[(!gv->video.p)].pagesize);
+		//_fmemmove((gv->video.page[(gv->video.p)]).data, (gv->video.page[(!gv->video.p)]).data, gv->video.page[(!gv->video.p)].pagesize);
+		modexCopyPageRegion(&(gv->video.page[(gv->video.p)]), &(gv->video.page[(!gv->video.p)]), 0, 0, 0, 0, gv->video.page[gv->video.p].width, gv->video.page[!gv->video.p].height);
 		/* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */
 		vga_restore_rm0wm0();
 		modexShowPage(&(gv->video.page[gv->video.p]));
diff --git a/src/scroll.c b/src/scroll.c
index 92cdf662..4bb41796 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -190,7 +190,8 @@ void main(int argc, char *argv[])
 	//IN_initplayer(&player, 1);
 
 #ifndef	SPRITE
-	modexClearRegion(mv[1].page, player[0].x, player[0].y-TILEWH, 24, 32, 15);
+	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);
 	PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,	&pp);
diff --git a/src/test.c b/src/test.c
index 69d35d04..098c12a7 100755
--- a/src/test.c
+++ b/src/test.c
@@ -184,6 +184,8 @@ void main(int argc, char *argv[])
 		if(IN_KeyDown(2+1)){ pan.pn=1; }
 		if(IN_KeyDown(3+1)){ pan.pn=2; }
 		if(IN_KeyDown(4+1)){ pan.pn=3; }
+		if(IN_KeyDown(12)) modexClearRegion(&gvar.video.page[0], (gvar.video.page[0].width/2)-4, (gvar.video.page[0].height/2)-16, 24, 32, 15);
+		if(IN_KeyDown(13)) modexClearRegion(&gvar.video.page[1], (gvar.video.page[1].width/2)-4, (gvar.video.page[1].height/2)-16, 24, 32, 15);
 		if(IN_KeyDown(7)){
 			for(i=0;i<3;i++)
 			{
diff --git a/vrl2vrs b/vrl2vrs
index b67956b7..acdd4bda 100755
Binary files a/vrl2vrs and b/vrl2vrs differ
diff --git a/vrsdump b/vrsdump
index dbaba30e..8ba0497d 100755
Binary files a/vrsdump and b/vrsdump differ