From 90a0252c317577ed379ff4288c188f872a75b9fe Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Sun, 23 Nov 2014 12:02:56 -0600
Subject: [PATCH] 	modified:   16/modex16/ptmp.pcx 	modified:  
 16/modex16/scroll.c 	modified:   16/modex16/scroll.exe

---
 16/modex16/ptmp.pcx   | Bin 5047 -> 5047 bytes
 16/modex16/scroll.c   |  43 +++++++++++++++++++++----------------------
 16/modex16/scroll.exe | Bin 20176 -> 20160 bytes
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/16/modex16/ptmp.pcx b/16/modex16/ptmp.pcx
index 57cfd19698e19e70b54414bc3613029bae8af08d..e6693f538af4747105b7072c973f67189c27367d 100644
GIT binary patch
delta 302
zcmZWkF$%&!5Il42vIe|t0wHNc8;xLf4-srF{gV0te;}l=un>YNG->>gg}XsTu~^u-
znVp+C7RTZ+!JgkvakTJ^{l*Xy0-+Dngn@1^3{-grq}tR*1oT!=Bd}7;E*r${=e*qD
z&VpyT+s?z`s@n)HT}_3c_HmMi9xTcWl2v~hRn+G4r;%Kd%c?=<BHR41<vu)HX|Q(V
yrI#EM5;Zok`b#p!jp-wcyU^NCTY&i%v?dmB7Fx=n{MM1>-OU1<=Xv?yQ}6^x2r;_=

delta 302
zcmZWkF$%&!5Il42vIe|tgpg}Q8;#&w0=AYuz|W{3@CQN)3kxBbLX*a~*jl(7R1}Ma
zotxRYnL~ES_G9e$%>;+JXYAI7kPrxcnDiOw`och^XF#e<Wkf)41=Rve#q82v+<eZ9
zHEu0<mb=X?94y+6(9*?}2x=eqlhA`jc|o%3FQbaeoc}bED{^VsOI>8^AGX+qCo2t>
zZZ!9jLqej)23CJbrnoj;WN{Z-`)La>--5=(;>|)!8I<2zvbecvVDr_zc<?cJ0@1oK
A$N&HU

diff --git a/16/modex16/scroll.c b/16/modex16/scroll.c
index 24e91e74..dff1410c 100644
--- a/16/modex16/scroll.c
+++ b/16/modex16/scroll.c
@@ -28,8 +28,6 @@ typedef struct {
 	page_t *page;
 	int tx; //appears to be the top left tile position on the viewable screen map
 	int ty; //appears to be the top left tile position on the viewable screen map
-//	int ttx; //bottem right tile
-//	int tty; //bottem left tile
 	word dxThresh; //????
 	word dyThresh; //????
 } map_view_t;
@@ -38,7 +36,8 @@ struct {
 	int x; //player exact position on the viewable map
 	int y; //player exact position on the viewable map
 	int tx; //player tile position on the viewable map
-	int ty; //player tile position on the viewable map
+	int ty; //player tile position on the viewable map
+	int hp; //hitpoints of the player
 } player;
 
 
@@ -61,7 +60,7 @@ void animatePlayer(map_view_t *mv, short d1, short d2, int x, int y, int ls, bit
 //place holder definitions
 #define MAPX 40
 #define MAPY 30
-//#define SWAP(a, b) tmp=a; a=b; b=tmp;
+#define SWAP(a, b) tmp=a; a=b; b=tmp;
 void main() {
 	bitmap_t ptmp; // player sprite
 	int q=0;
@@ -76,7 +75,7 @@ void main() {
 	map = allocMap(MAPX,MAPY); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
 	initMap(&map);
 	mv.map = &map;
-//	mv2.map = &map;
+	mv2.map = &map;
 
 	/* draw the tiles */
 	ptr = map.data;
@@ -86,18 +85,18 @@ void main() {
 	screen = modexDefaultPage();
 	screen.width += (TILEWH*2);
 	mv.page = &screen;
-//	screen2=modexNextPage(mv.page);
-//	mv2.page = &screen2;
-//	mapGoTo(&mv2, 16, 16);
-//	modexShowPage(mv.page);
+	screen2=modexNextPage(mv.page);
+	mv2.page = &screen2;
+	modexShowPage(mv.page);
 
 	/* set up paging */
-//	show = &mv;
-//	draw = &mv2;
-	draw = &mv;
+	show = &mv;
+	draw = &mv2;
+//	draw = &mv;
 
 //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
-	mapGoTo(draw, 0, 0);
+	mapGoTo(draw, 0, 0);
+	mapGoTo(show, 0, 0);
 
 	//TODO: put player in starting position of spot
 	//default player position on the viewable map
@@ -126,8 +125,8 @@ void main() {
 				animatePlayer(draw, 1, 1, player.x, player.y, q, &ptmp);
 				mapScrollRight(draw, SPEED);
 				modexShowPage(draw->page);
-//		mapScrollRight(draw, 1);
-//		SWAP(draw, show);
+//				mapScrollRight(draw, SPEED);
+//				SWAP(draw, show);
 			}
 			player.tx++;
 		}
@@ -155,8 +154,8 @@ void main() {
 				animatePlayer(draw, 3, 1, player.x, player.y, q, &ptmp);
 				mapScrollLeft(draw, SPEED);
 				modexShowPage(draw->page);
-// 		mapScrollLeft(show, 1);
-//		SWAP(draw, show);
+//				mapScrollLeft(show, SPEED);
+//				SWAP(draw, show);
 			}
 			player.tx--;
 		}
@@ -175,7 +174,7 @@ void main() {
 
 	if(keyp(80))
 	{
-		modexDrawSpriteRegion(draw->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
+//		modexDrawSpriteRegion(draw->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
 		if(draw->ty >= 0 && draw->ty+15 < MAPY && player.ty == draw->ty + 8)
 		{
 			for(q=0; q<(TILEWH/SPEED); q++)
@@ -184,8 +183,8 @@ void main() {
 				animatePlayer(draw, 2, 1, player.x, player.y, q, &ptmp);
 				mapScrollDown(draw, SPEED);
 				modexShowPage(draw->page);
-//		mapScrollDown(show, 1);
-//		SWAP(draw, show);
+//				mapScrollDown(show, SPEED);
+//				SWAP(draw, show);
 			}
 			player.ty++;
 		}
@@ -212,8 +211,8 @@ void main() {
 				animatePlayer(draw, 0, 1, player.x, player.y, q, &ptmp);
 				mapScrollUp(draw, SPEED);
 				modexShowPage(draw->page);
-//		mapScrollUp(show, 1);
-//		SWAP(draw, show);
+//				mapScrollUp(show, SPEED);
+//				SWAP(draw, show);
 			}
 			player.ty--;
 		}
diff --git a/16/modex16/scroll.exe b/16/modex16/scroll.exe
index b3114f26aa540c4ab3345cdc5c5f1fe86b12d911..3f3b8d78ee79cf6c86bcb4c425ff33ed58bbaafa 100755
GIT binary patch
delta 2262
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
YZdamQ@5__xGlE=~=F>X9wH$!|0(6O_fB*mh

delta 2141
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

-- 
2.11.0