From: sparky4 <sparky4@cock.li>
Date: Fri, 5 Dec 2014 03:47:26 +0000 (-0600)
Subject: 	modified:   Project 16.bfproject
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=0c925b2b0d1719a71b7688b13839d41470a59872;p=16.git

	modified:   Project 16.bfproject
	modified:   scroll.exe
	modified:   src/scroll.c
---

diff --git a/Project 16.bfproject b/Project 16.bfproject
index 63c9bd70..ebde19af 100644
--- a/Project 16.bfproject	
+++ b/Project 16.bfproject	
@@ -2,7 +2,7 @@ c2e.convert_special: 0
 e2c.convert_num: 0
 openfiles: /dos/z/16/doc/project.txt:60:0:0:
 openfiles: /dos/z/16/16.c:0:0:0:
-openfiles: /dos/z/16/src/scroll.c:4649:3633:1:
+openfiles: /dos/z/16/src/scroll.c:17044:16836:1:
 openfiles: /dos/z/16/src/lib/scroll.c:1666:0:0:
 openfiles: /dos/z/16/src/lib/scroll.h:1961:241:0:
 openfiles: /dos/z/16/src/v2/source/ENGINE/CONTROLS.C:2441:1179:0:
@@ -18,7 +18,7 @@ openfiles: /dos/z/16/src/test2.c:18:0:0:
 openfiles: /dos/z/16/src/lib/bitmap.c:59:0:0:
 openfiles: /dos/z/16/src/lib/bitmap.h:125:0:0:
 openfiles: /dos/z/16/src/lib/lib_head.cpp:0:0:0:
-openfiles: /dos/z/16/src/lib/types.h:98:0:0:
+openfiles: /dos/z/16/src/lib/types.h:242:0:0:
 openfiles: /dos/z/16/makefile:22:0:0:
 openfiles: /dos/z/16/16/dos_gfx.cpp:6388:0:0:
 openfiles: /dos/z/16/16/dos_gfx.h:175:233:0:
diff --git a/scroll.exe b/scroll.exe
index 3f4a3c79..6126c4e2 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/scroll.c b/src/scroll.c
index bf910772..530f305f 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -40,8 +40,8 @@ struct {
 	int ty; //player tile position on the viewable map
 	int triggerx; //player's trigger box tile position on the viewable map
 	int triggery; //player's trigger box tile position on the viewable map
-	sword q; //loop variable
-	sword d; //direction
+	word q; //loop variable
+	word d; //direction
 	int hp; //hitpoints of the player
 } player;
 
@@ -56,7 +56,7 @@ void mapGoTo(map_view_t *mv, int tx, int ty);
 void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);
 void mapDrawRow(map_view_t *mv, int tx, int ty, word y);
 void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
-sword dpad(sword keypressed);
+void dpad(sword k);
 void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short d1, short d2, int x, int y, int ls, int lp, bitmap_t *bmp);
 
 #define TILEWH 16
@@ -79,8 +79,7 @@ void main() {
 	map_view_t mv, mv2, mv3;
 	map_view_t *bg, *spri, *mask;//, *tmp;
 	byte *pal;
-	byte *ptr;
-	sword keypressed = 0;
+	byte *ptr;
 
 	player.q=1;
 	player.d=0;
@@ -150,9 +149,7 @@ void main() {
 	//TODO: make this better like rpg maker 2000 better
 	if(player.q == 1)
 	{
-		dpad(keypressed);
-		if(keypressed>1){ dpad(keypressed); }
-		keypressed = 0;
+		dpad(0/*, 0*/);
 	}
 
 	#define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
@@ -581,15 +578,31 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
 	}
 }
 
-sword
-dpad(sword keypressed)
-{
-	if(keypressed>1) keypressed=0;
-	if(keyp(75) && !keyp(77)){ player.d = 4; keypressed++; }
-	if(keyp(80) && !keyp(72)){ player.d = 3; keypressed++; }
-	if(keyp(77) && !keyp(75)){ player.d = 2; keypressed++; }
-	if(keyp(72) && !keyp(80)){ player.d = 1; keypressed++; }
-	return keypressed;
+//sword
+void
+dpad(sword k/*, sword q*/)
+{
+	//printf("p1: %d\n", k);
+	//keypressed=0;
+	//if(q>1){ q=0; return q; }
+	//if(keypressed>1){ keypressed=0; return keypressed; }
+	if(k==0)
+	{
+		if(keyp(75) && !keyp(77)){ player.d = 4; k--; }
+		if(keyp(80) && !keyp(72)){ player.d = 3; k--; }
+		if(keyp(77) && !keyp(75)){ player.d = 2; k++; }
+		if(keyp(72) && !keyp(80)){ player.d = 1; k++; }
+	}
+	else
+	{
+		if(keyp(72) && !keyp(80)){ player.d = 1; k++; }
+		if(keyp(77) && !keyp(75)){ player.d = 2; k++; }
+		if(keyp(80) && !keyp(72)){ player.d = 3; k--; }
+		if(keyp(75) && !keyp(77)){ player.d = 4; k--; }
+	} 
+	//printf("p2: %d\n", k);
+	//if(k>1 || k<-1){ dpad(0); }
+	//return keypressed=0;
 }
 
 void