From: sparky4 <sparky4@cock.li>
Date: Mon, 13 Jun 2016 17:43:07 +0000 (-0500)
Subject: wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=26ce854d2ae9675acd7c91f30f281759d78ebfef;p=16.git

wwww
---

diff --git a/pcx2vrl b/pcx2vrl
index 3d9ac6e6..bd947e55 100755
Binary files a/pcx2vrl and b/pcx2vrl differ
diff --git a/pcxsscut b/pcxsscut
index d743ac3b..1deec74d 100755
Binary files a/pcxsscut and b/pcxsscut differ
diff --git a/scroll.l16 b/scroll.l16
index c3e80861..e1bbad70 100755
--- a/scroll.l16
+++ b/scroll.l16
@@ -1,28 +1,118 @@
 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
+chkmap ok	12
+12
+8
+8
+4
+4
+12
+12
+8
+8
+4
+4
+12
+12
+8
+8
+4
+4
+12
+12
+8
+8
+4
+4
+12
+12
+8
+8
+4
+4
+12
+12
+8
+8
+4
+4
+12
+12
+8
+8
+4
+4
+12
+12
+8
+8
+4
+4
+12
+12
+8
+8
+4
+4
+12
+12
+8
+8
+4
+4
+12
+12
+8
+8
+4
+4
+12
+12
+8
+8
+4
+4
+12
+12
+8
+8
+4
+4
+12
+12
+8
+8
+4
+4
+12
+12
+8
+8
+4
+4
+Project 16 scroll.exe. This is just a test file!
+version Jun 13 2016 11:37:38
 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
+ty: 2
+player.x: 112		player.y: 128
+player.tx: 7		player.ty: 10
+player.triggx: 6	player.triggy: 10
+player.hp: 4	player.q: 1	player.info.dir: 2	player.d: 2 pdir=1
+tile data value at player trigger position: 1
 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
+page 	[0]=(a000:0b00) size=23936	sw=320  sh=240  width=352  height=272
+	[1]=(a000:6880) size=23936	sw=320  sh=240  width=352  height=272
+	[2]=(a000:bb08) size=1024	sw=64  sh=64  width=64  height=64
+	[3]=(a000:bf08) 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
+gvar.video.tickclk=0.164835
+gvar.video.clk=0.109890
 
 detected CPU type: 386 or newer
diff --git a/src/lib/jsmn b/src/lib/jsmn
index bbc6755f..d1c85c56 160000
--- a/src/lib/jsmn
+++ b/src/lib/jsmn
@@ -1 +1 @@
-Subproject commit bbc6755fce14c713f9bb4ba47c688d15efc1394b
+Subproject commit d1c85c569d11b8f014858982d5744b5139c52cc1
diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index 91ca7c79..7dbe38a1 100755
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -84,6 +84,7 @@ typedef struct {
 	sword tileplayerposscreeny;	/* player position on screen */
 	word stridew;			/*width/4*/
 	word pagesize;			/* page size */
+	word pi;				/* incremention page by this much to preserve location */
 } page_t;
 
 typedef struct
diff --git a/vrl2vrs b/vrl2vrs
index acdd4bda..b67956b7 100755
Binary files a/vrl2vrs and b/vrl2vrs differ
diff --git a/vrsdump b/vrsdump
index 8ba0497d..dbaba30e 100755
Binary files a/vrsdump and b/vrsdump differ