From: sparky4 <sparky4@cock.li>
Date: Sun, 19 Apr 2015 03:26:15 +0000 (-0500)
Subject: wwww working on it! wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=f906c5a2bf24af0c9990f2c3f6b60bf2237ec5f4;p=16.git

wwww working on it! wwww
	new file:   0.bat
	modified:   data/g.pal
	modified:   pcxtest.exe
	modified:   scroll.exe
	modified:   src/lib/modex16.c
	modified:   src/lib/modex16.h
	modified:   src/scroll.c
	modified:   test.exe
	modified:   test2.exe
---

diff --git a/0.bat b/0.bat
new file mode 100644
index 00000000..24cb25c9
--- /dev/null
+++ b/0.bat
@@ -0,0 +1 @@
+wmakescroll.exe > ..\w
diff --git a/data/g.pal b/data/g.pal
index cf668e35..a234f82c 100644
Binary files a/data/g.pal and b/data/g.pal differ
diff --git a/pcxtest.exe b/pcxtest.exe
index f7b77f5a..988abb27 100644
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/scroll.exe b/scroll.exe
index aa86e660..6d58563b 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index eb3f1f38..4ce84b8c 100644
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -481,7 +481,7 @@ fadePalette(sbyte fade, sbyte start, word iter, byte *palette) {
 
     /* handle the case where we just update */
     if(iter == 0) {
-	modexPalUpdate2(palette);
+	modexPalUpdate1(palette);
 	return;
     }
 
@@ -494,7 +494,7 @@ fadePalette(sbyte fade, sbyte start, word iter, byte *palette) {
 		tmppal[i] = 63;
 	    }
 	}
-        modexPalUpdate2(tmppal);
+        modexPalUpdate1(tmppal);
 	iter--;
 	dim += fade;
     }
@@ -632,16 +632,10 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
 			}
 			else if(qp>0 && (*i)>=(qp) && (*i)<((qp)+3))
 			{
-				/*
-									note to self
-									use a[qp] instead of bmp->offset for this spot!
-				*/
 				//printf("qp=%d\n", qp);
-				//printf("						(*i)=%d\n", (*i)/3);
-				//for(w=(*i); w<()){
-				printf("		(*i)=%d	a[%d]=%d\n", (*i), qp, a[qp]);
+				//printf("		(*i)=%d	a[%d]=%d\n", (*i), qp, a[qp]);
 				printf("		%d's color=%d\n", (*i), (a[qp])-(bmp->offset*3)+qp);
-				outp(PAL_DATA_REG, p[((a[qp])-(bmp->offset*3)+qp)]);// fix this shit!
+				//outp(PAL_DATA_REG, p[((a[qp])-(bmp->offset*3)+qp)]);// fix this shit!
 				if((*i)+1==(qp)+3){ w++; /*(*i)++;*/ break; }
 			}
 			else
@@ -649,8 +643,8 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
 				if(bmp->offset==0 && (*i)<3 && q==0) outp(PAL_DATA_REG, 0);
 				else
 				if(qp==0) outp(PAL_DATA_REG, p[(*i)-q]);
-				else outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)+qp)]);
-				printf("p[]=%d	qp=%d	p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp);
+				else{ //outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)+qp)]);
+				printf("p[]=%d	qp=%d	p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp); }
 			}
 		}
 		//if(qp>0) printf("qp=%d\n", qp);
@@ -669,30 +663,22 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
 			}
 			else if(qp>0 && (*i)>=(qp) && (*i)<((qp)+3))
 			{
-				/*
-									note to self
-									use a[qp] instead of bmp->offset for this spot!
-				*/
 				//printf("qp=%d\n", qp);
-				//printf("						(*i)=%d\n", (*i)/3);
-				//for(w=(*i); w<()){
-				printf("		(*i)=%d	a[%d]=%d\n", (*i), qp, a[qp]);
+				//printf("		(*i)=%d	a[%d]=%d\n", (*i), qp, a[qp]);
 				printf("		%d's color=%d\n", (*i), (a[qp]-(bmp->offset*3)+qp));
-				outp(PAL_DATA_REG, p[((a[qp])-(bmp->offset*3)+qp)]);// fix this shit!
+				//outp(PAL_DATA_REG, p[((a[qp])-(bmp->offset*3)+qp)]);// fix this shit!
 				if((*i)+1==(qp)+3){ w++; /*(*i)++;*/ break; }
 			}
 			else
 			{
 				if(qp==0) outp(PAL_DATA_REG, p[(*i)-q]);
-				else outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)+qp)]);
-				printf("p[]=%d	qp=%d	p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp);
+				else{ //outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)+qp)]);
+				printf("p[]=%d	qp=%d	p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp); }
 			}
 		}
 		//printf("						(*i)=%d\n", (*i)/3);
 	}
 
-//	if(q>0) 
-//	printf("2	(*i)=%02d\n", (*i)/3);
 printf("\nqqqqqqqq\n\n");
 
 	//palette checker~
@@ -772,7 +758,7 @@ aqpee:
 }
 
 void
-modexPalUpdate2(byte *p)
+modexPalUpdate1(byte *p)
 {
 	int i;
 	modexWaitBorder();
@@ -789,7 +775,7 @@ modexPalUpdate2(byte *p)
 }
 
 void
-modexPalUpdate3(byte *p)
+modexPalUpdate0(byte *p)
 {
 	int i;
 	modexWaitBorder();
diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 41c0a66e..2a4987a5 100644
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -63,8 +63,8 @@ void modexPalWhite();
 
 /* utility functions */
 void modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset);
-void modexPalUpdate2(byte *p);
-void modexPalUpdate3(byte *p);
+void modexPalUpdate1(byte *p);
+void modexPalUpdate0(byte *p);
 void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/);
 void modexWaitBorder();
 
diff --git a/src/scroll.c b/src/scroll.c
index b833f7ce..8f77a4f0 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -64,7 +64,7 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword
 
 #define TILEWH 16
 #define QUADWH			TILEWH/2
-#define SPEED 16
+#define SPEED 4
 //#define LOOPMAX (TILEWH/SPEED)
 
 //place holder definitions
@@ -533,6 +533,74 @@ void main() {
 		player.triggery = player.ty-1;
 	}
 	//modexClearRegion(mask->page, 66, 66, 2, 40, 0);
+
+/*	//right movement
+	if((keyp(32) && !keyp(30) && player.d == 0) || player.d == 2)
+	{
+		if(player.d == 0){ player.d = 2; }
+		if(bg->tx >= 0 && bg->tx+20 < map.width)
+		{
+			if(player.q<=(TILEWH/SPEED))
+			{
+				bg->page->dx++;
+				modexShowPage(bg->page);
+				player.q++;
+			} else { player.q = 1; player.d = 0; }
+		}
+//		player.triggerx = player.tx+1;
+//		player.triggery = player.ty;
+	}
+
+	//left movement
+	if((keyp(30) && !keyp(32) && player.d == 0) || player.d == 4)
+	{
+		if(player.d == 0){ player.d = 4; }
+		if(bg->tx > 0 && bg->tx+20 <= map.width)
+		{
+			if(player.q<=(TILEWH/SPEED))
+			{
+				bg->page->dx--;
+				modexShowPage(bg->page);
+				player.q++;
+			} else { player.q = 1; player.d = 0; }
+		}
+		//player.triggerx = player.tx-1;
+		//player.triggery = player.ty;
+	}
+
+	//down movement
+	if((keyp(31) && !keyp(17) && player.d == 0) || player.d == 3)
+	{
+		if(player.d == 0){ player.d = 3; }
+		if(bg->ty >= 0 && bg->ty+15 < map.height)
+		{
+			if(player.q<=(TILEWH/SPEED))
+			{
+				bg->page->dy--;
+				modexShowPage(bg->page);
+				player.q++;
+			} else { player.q = 1; player.d = 0; }
+		}
+		//player.triggerx = player.tx;
+		//player.triggery = player.ty+1;
+	}
+
+	//up movement
+	if((keyp(17) && !keyp(31) && player.d == 0) || player.d == 1)
+	{
+		if(player.d == 0){ player.d = 1; }
+		if(bg->ty > 0 && bg->ty+15 <= map.height)
+		{
+			if(player.q<=(TILEWH/SPEED))
+			{
+				bg->page->dy++;
+				modexShowPage(bg->page);
+				player.q++;
+			} else { player.q = 1; player.d = 0; }
+		}
+		//player.triggerx = player.tx;
+		//player.triggery = player.ty-1;
+	}*/
 
 	if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
 	{
@@ -546,7 +614,7 @@ void main() {
 	if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; }
 	//if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; }
 	if(keyp(25)){ pdump(bg); pdump(spri); }
-	if(keyp(24)){ modexPalUpdate3(gpal); paloffset=0; pdump(bg); pdump(spri); }
+	if(keyp(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg); pdump(spri); }
 	if(keyp(22)){ 
 	paloffset=0; modexPalBlack(); modexPalUpdate(&ptmp, &paloffset, 0, 0);
 	printf("1paloffset	=	%d\n", paloffset/3);
@@ -932,5 +1000,5 @@ animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, s
 	//modexClearRegion(top->page, 66, 66, 2, 40, 0);
 	//modexCopyPageRegion(dest->page, top->page, 66, 66, 66, 66, 2, 40);
 	//turn this off if XT
-	//if(detectcpu() > 0) modexWaitBorder();
+	if(detectcpu() > 0) modexWaitBorder();
 }
diff --git a/test.exe b/test.exe
index 64cd695e..736b224a 100644
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index 0364d8b2..da9ec199 100644
Binary files a/test2.exe and b/test2.exe differ