X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.c;h=fa13d3658ccc16987c8127c7e0a90d17c0d2ec40;hb=60bed23e449fb5296f73e5cd6bddb0d8d7f0eb4c;hp=f303ecf412749fe49ec268da5aeaaa8233cc91ff;hpb=d2f92009f1d0cc3cf375c7d068a332190f350071;p=16.git

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index f303ecf4..fa13d365 100644
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -591,17 +591,16 @@ modexPalWhite() {
 
 /* utility */
 void
-modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqpp)
+modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
 {
-//----	static word count=0;
 	byte *p = bmp->palette;
 	word w=0;
 	word q=0;
 	word qq=0;
-	word ii;
-	static word a[PAL_SIZE/3];
-	word z=0, aq=0, aa=0, pp=0, apee=0;
-	sword aqpw;
+	//word ii;
+	static word a[PAL_SIZE/3];	//palette array of change values!
+	word z=0, aq=0, aa=0, pp=0;
+	//sword aqpw;
 
 	//printf("1	(*i)=%02d\n", (*i)/3);
 	modexWaitBorder();
@@ -630,52 +629,35 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqpp)
 		{
 			//if(i%3==0 && (p[i+5]==p[i+4] && p[i+4]==p[i+3] && p[i+3]==p[i+2] && p[i+2]==p[i+1] && p[i+1]==p[i] && p[i+5]==p[i]))
 //____			if((qp>0)&&((*i)-q)%3==0 && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5])) outp(PAL_DATA_REG, p[(*i)-q]); else
-			if(((((*i)-q)%3==0) || ((qp>0)&&((*i)-(bmp->offset*3))%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))
+			if(((((*i)-q)%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))
 			{
-				if(q>0)
-				{
-/*					(*i)-=(aqpp*3);
-					aqpw=aqpp-1;
-					outp(PAL_WRITE_REG, qq+(((*i)+(aqpw*3)-(bmp->offset*3))/3));
-					for(ii=aqpp; ii>0; ii--)
-					{
-						outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))]);
-						outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3)+1)-(bmp->offset*3))]);
-						outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3)+2)-(bmp->offset*3))]);*/
-						printf("%d's color=%d\n", (*i)/3, ((*i)-(bmp->offset*3)));
-						printf("%d's color2=%d\n", (*i)/3, ((*i)-(bmp->offset*3))-(aqpp*3));
-//						printf("position	=	%d\n", qq+(((*i)+(aqpw*3)-(bmp->offset*3))/3));
-/*if(qp>0){ //printf("[%d]", p[((*i)-q)]);	printf("[%d]", p[((*i)-q)+1]);	printf("[%d]", p[((*i)-q)+2]);	printf("[%d]", p[((*i)-q)+3]);			printf("[%d]", p[((*i)-q)+4]);			printf("[%d]", p[((*i)-q)+5]);			printf("	%d [%d]\n", (*i), p[((*i)-q)]); }
-printf("[%d]", p[((((*i)+((aqpp-ii)*3)))-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+1)-(bmp->offset*3))]);
-printf("[%d] | ", p[((((*i)+((aqpp-ii)*3))+2)-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+3)-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+4)-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+5)-(bmp->offset*3))]);
-printf("	%d [%d]\n",((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))/3, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))]); }*/
-						//printf("%d\n", ((*i)+((ii)*3))/3);
-						//printf("ii=%d\n", ii);
-						//printf("aqpp=%d\n", aqpp);
-						//printf("			%d\n", ((*i)+((aqpp-ii)*3))/3);
-//					}
-					//printf("	%d\n",((((*i)+((aqpp-ii)*3)))-(bmp->offset*3)));
-					//printf("	%d\n",((((*i)+((aqpp-ii)*3))+1)-(bmp->offset*3)));
-					//printf("	%d\n",((((*i)+((aqpp-ii)*3))+2)-(bmp->offset*3)));
-					printf("						(*i)=%d\n", (*i)/3);
-				}
-				//if(q>0) printf("%d\n", (*i)/3);
-				//printf("[%d]", p[((*i)-q)]);	printf("[%d]", p[((*i)-q)+1]);	printf("[%d]", p[((*i)-q)+2]);	printf("[%d]", p[((*i)-q)+3]);			printf("[%d]", p[((*i)-q)+4]);			printf("[%d]", p[((*i)-q)+5]);			printf("	%d [%d]\n", (*i), p[((*i)-q)]);
 				w++;
 				break;
 			}
+			else if(qp>0 && (*i)>=(qp*3) && (*i)<((qp*3)+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]);
+//0000				printf("		%d's color=%d\n", (*i), (a[qp])*3);//+(aqoffset*3)
+//0000				outp(PAL_DATA_REG, p[((a[qp])*3)]);// fix this shit!
+				if((*i)+1==(qp*3)+3){ w++; /*(*i)++;*/ break; }
+			}
 			else
 			{
 				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))]);
+				else outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)/*+(aqoffset*3)*/)]);
 			}
 		}
+		//if(qp>0) printf("qp=%d\n", qp);
+		if(qp>0) printf("						(*i)=%d\n", (*i)/3);
 	}
 	modexWaitBorder();	    /* waits one retrace -- less flicker */
 	if((*i)>=PAL_SIZE/2 && w==0)
@@ -683,50 +665,29 @@ printf("	%d [%d]\n",((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))/3, p[
 		for(; (*i)<PAL_SIZE; (*i)++)
 		{
 //____			if((qp>0)&&((*i)-q)%3==0 && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5])) outp(PAL_DATA_REG, p[(*i)-q]); else
-			if(((((*i)-q)%3==0) || ((qp>0)&&((*i)-(bmp->offset*3))%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))
+			if(((((*i)-q)%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))
 			{
-				if(q>0)
-				{
-/*					(*i)-=(aqpp*3);
-					aqpw=aqpp-1;
-					outp(PAL_WRITE_REG, qq+(((*i)+(aqpw*3)-(bmp->offset*3))/3));
-					for(ii=aqpp; ii>0; ii--)
-					{
-						outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))]);
-						outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3)+1)-(bmp->offset*3))]);
-						outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3)+2)-(bmp->offset*3))]);*/
-						printf("%d's color=%d\n", (*i)/3, ((*i)-(bmp->offset*3)));
-						printf("%d's color2=%d\n", (*i)/3, ((*i)-(bmp->offset*3))-(aqpp*3));
-//						printf("position	=	%d\n", qq+(((*i)+(aqpw*3)-(bmp->offset*3))/3));
-/*if(qp>0){ //printf("[%d]", p[((*i)-q)]);	printf("[%d]", p[((*i)-q)+1]);	printf("[%d]", p[((*i)-q)+2]);	printf("[%d]", p[((*i)-q)+3]);			printf("[%d]", p[((*i)-q)+4]);			printf("[%d]", p[((*i)-q)+5]);			printf("	%d [%d]\n", (*i), p[((*i)-q)]); }
-printf("[%d]", p[((((*i)+((aqpp-ii)*3)))-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+1)-(bmp->offset*3))]);
-printf("[%d] | ", p[((((*i)+((aqpp-ii)*3))+2)-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+3)-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+4)-(bmp->offset*3))]);
-printf("[%d]", p[((((*i)+((aqpp-ii)*3))+5)-(bmp->offset*3))]);
-printf("	%d [%d]\n",((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))/3, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))]); }*/
-						//printf("%d\n", ((*i)+((ii)*3))/3);
-						//printf("ii=%d\n", ii);
-						//printf("aqpp=%d\n", aqpp);
-						//printf("			%d\n", ((*i)+((aqpp-ii)*3))/3);
-//					}
-					//printf("	%d\n",((((*i)+((aqpp-ii)*3)))-(bmp->offset*3)));
-					//printf("	%d\n",((((*i)+((aqpp-ii)*3))+1)-(bmp->offset*3)));
-					//printf("	%d\n",((((*i)+((aqpp-ii)*3))+2)-(bmp->offset*3)));
-					printf("						(*i)=%d\n", (*i)/3);
-				}
-				//if(q>0) printf("%d\n", (*i)/3);
-				//printf("[%d]", p[((*i)-q)]);	printf("[%d]", p[((*i)-q)+1]);	printf("[%d]", p[((*i)-q)+2]);	printf("[%d]", p[((*i)-q)+3]);			printf("[%d]", p[((*i)-q)+4]);			printf("[%d]", p[((*i)-q)+5]);			printf("	%d [%d]\n", (*i), p[((*i)-q)]);
 				w++;
 				break;
 			}
+			else if(qp>0 && (*i)>=(qp*3) && (*i)<((qp*3)+3))
+			{
+				//printf("qp=%d\n", qp);
+				//printf("						(*i)=%d\n", (*i)/3);
+				printf("	(*i)=%d	bmp->offset*3=%d	(qp*3)=%d\n", (*i), (bmp->offset), (qp));
+				printf("		%d's color=%d\n", (*i)/3, ((*i)-(bmp->offset)+(qp*3)));
+				//printf("		%d's color2=%d\n", (*i)/3, ((*i)-(bmp->offset*3))-(qp*3));
+				//outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3))+()]);
+				(*i)++;
+				break;
+			}
 			else
 			{
 				if(qp==0) outp(PAL_DATA_REG, p[(*i)-q]);
-				else outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3))]);
+				else outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3))+(qp*3)]);
 			}
 		}
+		//printf("						(*i)=%d\n", (*i)/3);
 	}
 
 //	if(q>0) 
@@ -740,7 +701,7 @@ printf("	%d [%d]\n",((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))/3, p[
 		pp = q;
 		//printf("1(*i)=%02d\n", (*i)/3);
 		//printf("1z=%02d\n", z/3);
-		chkcolor(bmp, &q, &a, &aa, &z, i, &aqpp);
+		chkcolor(bmp, &q, &a, &aa, &z, i);
 		//printf("2(*i)=%02d\n", (*i)/3);
 		//printf("2z=%02d\n", z/3);
 
@@ -750,17 +711,33 @@ aqpee:
 		{
 //			printf("a[%02d]=(%d)\n", aq, a[aq]);
 			if(a[aq]==-1) aq++;
-			else{ apee++; break; }
+			else { aqoffset++; break; }
 		}
 
-		//printf("(*i)	=%02d\n", (*i)/3);
-		//printf("z	=%02d\n", z/3);
-		//if(aq<aa) printf("aq=%02d\n", aq);
-		printf("aqpp=%02d\n", aqpp);
-		printf("apee=%02d\n", apee);
-
 	for(lq=0; lq<bufSize; lq++)
 	{
+				/*
+									note to self
+									use a[qp] instead of bmp->offset for this spot!
+									NO! wwww
+				*/
+
+
+
+
+				/*
+				Facking bloody point the values of the changed palette to correct values.... major confusion! wwww
+				*/
+
+
+
+
+
+		//(offset/bmp->offset)*bmp->offset
+
+
+		printf("%02d ",bmp->data[lq]+bmp->offset);
+		if(lq > 0 && lq%bmp->width==0) printf("\n");
 		//printf("%02d_", bmp->data[lq]+bmp->offset);
 		/*if(bmp->data[lq]+bmp->offset==aq)
 		{
@@ -790,13 +767,13 @@ aqpee:
 	}
 
 //printf("		aq=%02d\n", aq);
-//printf("		aa=%02d\n", aa);/
+//printf("		aa=%02d\n", aa);
 
 	//update the palette~
-	modexPalUpdate(bmp, &pp, 1, aqpp);
+	modexPalUpdate(bmp, &pp, aq, aqoffset);
 	(*i)=pp;
 
-	if(aq<aa){ /*printf("~~~~\n"); */pp=q; aq++; goto aqpee; }
+	if(aq<aa){ pp=q; aq++; goto aqpee; }
 	}
 }
 
@@ -836,7 +813,7 @@ modexPalUpdate3(byte *p)
 
 //color checker~
 //i want to make another vesion that checks the palette when the palette is being appened~
-void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i, word *offset)
+void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/)
 {
 		byte *pal;
 		word zz=0;
@@ -846,14 +823,16 @@ void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i, word
 		printf("chkcolor start~\n");
 		printf("1				(*z): %d\n", (*z)/3);
 		printf("1				(*i): %d\n", (*i)/3);
+//		printf("1 offset of color in palette	(*q): %d\n", (*q)/3);
+		printf("wwwwwwwwwwwwwwww\n");
 		//check palette for dups
 		for(; (*z)<PAL_SIZE; (*z)+=3)
 		{
-//			printf("\n		z: %d\n", (*z));
-//			printf("		q: %d\n", (*q));
-//			printf("		z+q: %d\n\n", ((*z)+(*q)));
-			if((*z)%3==0)
-			{
+			//printf("\n		z: %d\n", (*z));
+			//printf("		q: %d\n", (*q));
+			//printf("		z+q: %d\n\n", ((*z)+(*q)));
+			//if((*z)%3==0)
+			//{
 //----				if(pal[(*z)]==pal[(*z)+3] && pal[(*z)+1]==pal[(*z)+4] && pal[(*z)+2]==pal[(*z)+5])
 				if((*z)==(*i))
 				{
@@ -864,17 +843,15 @@ void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i, word
 				}
 				else for(zz=0; zz<(*q); zz+=3)
 				{
-					//zq=(zz+(q-3));
 					//printf("zz: %02d\n", zz/3);
 					if(zz%3==0)
 					{
-						if(pal[((*z)+(*q))]==pal[((*z)+(*q))+3] && pal[((*z)+(*q))+1]==pal[((*z)+(*q))+4] && pal[((*z)+(*q))+2]==pal[((*z)+(*q))+5])
+						if(pal[((*z)+(*q))]==pal[((*z)+(*q))+3] && pal[((*z)+(*q))+1]==pal[((*z)+(*q))+4] && pal[((*z)+(*q))+2]==pal[((*z)+(*q))+5])	//break if duplicate colors found in palette because it have reached the end of the current data of the palette
 						{
 //							(*z)-=3;
 //							(*i)-=3;
 //							printf("\nzq1:%d[%02d][%02d][%02d]\n", (zz+q), pal[(zz+q)], pal[(zz+q)+1], pal[(zz+q)+2]);
 //							printf("zq2:%d[%02d][%02d][%02d]\n\n", (zz+q)+3, pal[(zz+q)+3], pal[(zz+q)+4], pal[(zz+q)+5]);
-//0000							printf("wwww\n");
 							break;
 						}
 						else if(pal[zz]==pal[((*z)+(*q))] && pal[zz+1]==pal[((*z)+(*q))+1] && pal[zz+2]==pal[((*z)+(*q))+2])
@@ -886,11 +863,20 @@ void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i, word
 //							printf("	z : %d	[%02d][%02d][%02d] offset value~\n", (*z)/3, pal[(*z)], pal[(*z)+1], pal[(*z)+2]);
 //++++							(*i)--;
 //							(*z)--;
-//							printf("(*z)=%d\n", (*z)/3);
-							a[(((*z)+(*q))/3)-(*offset)]=zz/3;
-							(*aa)=(((*z)+(*q))/3)-(*offset);
-							printf("!!				a[%02d]: %d\n", (((*z)+(*q))/3)-(*offset), zz/3);
-							(*offset)++;
+							//expand dong here
+/*
+planned features that i plan to implement~
+image that has values on the pallete list!
+wwww
+no... wait.... no wwww
+*/
+							//for(zzii=0; zzii<3; zzii++)
+							//{
+								//printf("z+q: %d\n\n", ((*z)+(*q)));
+								a[(((*z)+(*q)))]=zz;
+							//}
+							(*aa)=(((*z)+(*q)));
+							printf("!!					a[%02d]: %d\n", (((*z)+(*q))/3), zz/3);
 //							printf("\n		aa: %d\n\n", (*aa));
 //							printf("	a[%02d]=(%02d) offset array i think the palette should be updated again~\n", ((*z)+(*q))/3, a[((*z)+(*q))/3]);
 //							printf("wwwwwwwwwwwwwwww\n\n");
@@ -906,14 +892,11 @@ void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i, word
 						//printf("[%d]", (zz+q));
 					}
 				}
-				//printf("\nz:	%d\n", z);
-				//printf("q:	%d\n", q);
-				//printf("zz:	%d\n", zz);
-			}
 		}
-		//printf("		aa: %d\n", (*aa));
+		printf("wwwwwwwwwwwwwwww\n");
 		printf("2				(*z): %d\n", (*z)/3);
 		printf("2				(*i): %d\n", (*i)/3);
+//		printf("2 offset of color in palette	(*q): %d\n", (*q)/3);
 		printf("chkcolor end~\n");
 		free(pal);
 }