wwww

diff --git a/pcx2vrl b/pcx2vrl
index 3d9ac6e6d0e4fe19bb8f1962de5fd02253dea7be..bd947e55158b82b4f9d900234745aca806cde60e 100755 (executable)
Binary files a/pcx2vrl and b/pcx2vrl differ

diff --git a/pcxsscut b/pcxsscut
index d743ac3b8ac58a73b3cb2380e2367aee9b167169..1deec74dc0487422bfdb03acb381df671e83a049 100755 (executable)
Binary files a/pcxsscut and b/pcxsscut differ

diff --git a/scroll.l16 b/scroll.l16
index c3e808612100d8e06f181b39a63b4fb630592c3b..e1bbad70de2ee0d43da28967366fcd6ee221ddcf 100755 (executable)
--- a/scroll.l16
+++ b/scroll.l16
@@ -1,28 +1,118 @@
 WARNING: Failed to initialize DEBUG output\r
 starting timer ok\r
 index=4096\r
-chkmap ok      Project 16 scroll.exe. This is just a test file!\r
-version Jun  9 2016 11:32:02\r
+chkmap ok      12\r
+12\r
+8\r
+8\r
+4\r
+4\r
+12\r
+12\r
+8\r
+8\r
+4\r
+4\r
+12\r
+12\r
+8\r
+8\r
+4\r
+4\r
+12\r
+12\r
+8\r
+8\r
+4\r
+4\r
+12\r
+12\r
+8\r
+8\r
+4\r
+4\r
+12\r
+12\r
+8\r
+8\r
+4\r
+4\r
+12\r
+12\r
+8\r
+8\r
+4\r
+4\r
+12\r
+12\r
+8\r
+8\r
+4\r
+4\r
+12\r
+12\r
+8\r
+8\r
+4\r
+4\r
+12\r
+12\r
+8\r
+8\r
+4\r
+4\r
+12\r
+12\r
+8\r
+8\r
+4\r
+4\r
+12\r
+12\r
+8\r
+8\r
+4\r
+4\r
+12\r
+12\r
+8\r
+8\r
+4\r
+4\r
+12\r
+12\r
+8\r
+8\r
+4\r
+4\r
+12\r
+12\r
+8\r
+8\r
+4\r
+4\r
+Project 16 scroll.exe. This is just a test file!\r
+version Jun 13 2016 11:37:38\r
 tx: 0\r
-ty: 0\r
-player.x: 160          player.y: 128\r
-player.tx: 10          player.ty: 8\r
-player.triggx: 10      player.triggy: 9\r
-player.hp: 4   player.q: 1     player.info.dir: 2      player.d: 2 pdir=0\r
-tile data value at player trigger position: 0\r
+ty: 2\r
+player.x: 112          player.y: 128\r
+player.tx: 7           player.ty: 10\r
+player.triggx: 6       player.triggy: 10\r
+player.hp: 4   player.q: 1     player.info.dir: 2      player.d: 2 pdir=1\r
+tile data value at player trigger position: 1\r
 Virtual Screen: 352x272\r
 Screen: 320x240\r
 virtual tile resolution: 22x17\r
 tile resolution: 20x15 \r
 middle tile position: 10x8\r
 video memory remaining: 65535\r
-page   [0]=(a000:0000) size=23936      sw=320  sh=240  width=352  height=272\r
-       [1]=(a000:5d80) size=23936      sw=320  sh=240  width=352  height=272\r
-       [2]=(a000:bb00) size=1024       sw=64  sh=64  width=64  height=64\r
-       [3]=(a000:bf00) size=16640      sw=320  sh=208  width=320  height=208\r
+page   [0]=(a000:0b00) size=23936      sw=320  sh=240  width=352  height=272\r
+       [1]=(a000:6880) size=23936      sw=320  sh=240  width=352  height=272\r
+       [2]=(a000:bb08) size=1024       sw=64  sh=64  width=64  height=64\r
+       [3]=(a000:bf08) size=16640      sw=320  sh=208  width=320  height=208\r
 gvar.video.p=1 gvar.video.r=0 pageflipflop=1\r
 \r
-gvar.video.tickclk=1926.703247\r
-gvar.video.clk=0.000000\r
+gvar.video.tickclk=0.164835\r
+gvar.video.clk=0.109890\r
 \r
 detected CPU type: 386 or newer\r

diff --git a/src/lib/jsmn b/src/lib/jsmn
index bbc6755fce14c713f9bb4ba47c688d15efc1394b..d1c85c569d11b8f014858982d5744b5139c52cc1 160000 (submodule)
--- 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 91ca7c79cba8da8bc4bd15dd0dd3e4072f19c240..7dbe38a1aa26426f561699dfbc43d5b46ca67ee0 100755 (executable)
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -84,6 +84,7 @@ typedef struct {
        sword tileplayerposscreeny;     /* player position on screen */\r
        word stridew;                   /*width/4*/\r
        word pagesize;                  /* page size */\r
+       word pi;                                /* incremention page by this much to preserve location */\r
 } page_t;\r
 \r
 typedef struct\r

diff --git a/vrl2vrs b/vrl2vrs
index acdd4bda2f0dd8772cdce97a19b6c906e4e09f8e..b67956b7baa37941b88ad79da1a2ff49c0c435a0 100755 (executable)
Binary files a/vrl2vrs and b/vrl2vrs differ

diff --git a/vrsdump b/vrsdump
index 8ba0497deb819d75caeef21a3a0d4086b394845b..dbaba30e42b8639969d3bdd4433243eb338adcbe 100755 (executable)
Binary files a/vrsdump and b/vrsdump differ