From: sparky4 <sparky4@cock.li>
Date: Fri, 6 May 2016 17:11:07 +0000 (-0500)
Subject: ww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=c60a37b1fcd07f11b76d699e20c5d203e6636bd0;p=16.git

ww
---

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/src/lib/modex16.c b/src/lib/modex16.c
index ee7f156c..a32bd964 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -155,7 +155,6 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 	//TODO MAKE FLEXIBLE~
 //	gv->video.page[0].tilemidposscreenx = gv->video.page[0].tilesw;
 //	gv->video.page[0].tilemidposscreeny = (gv->video.page[0].tilesh/2)+1;
-	gv->video.num_of_pages=0;
 }
 
 void
@@ -249,6 +248,7 @@ void modexCalcVmemRemain(video_t *video)
 void modexHiganbanaPageSetup(video_t *video)
 {
 	video->vmem_remain=262144L;
+	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[1]) = modexNextPage(&(video->page[0]));	video->num_of_pages++;
diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index 732053c1..d6f972b1 100755
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -72,12 +72,12 @@ typedef struct {
 	word dy;		/* row we are viewing on the virtual screen */
 	word sw;		/* screen width */
 	word sh;		/* screen heigth */
-	word tilesw;		/* screen width in tiles */
-	word tilesh;		/* screen height in tiles */
+	word tw;		/* screen width in tiles */
+	word th;		/* screen height in tiles */
 	word width;		/* virtual width of the page */
 	word height;	/* virtual height of the page */
-	word tw;
-	word th;
+	word tilesw;		/* virtual screen width in tiles */
+	word tilesh;		/* virtual screen height in tiles */
 	sword tilemidposscreenx;	/* middle tile position */
 	sword tilemidposscreeny;	/* middle tile position */
 	sword tileplayerposscreenx;	/* player position on screen */
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