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 (file)
index 0000000..24cb25c
--- /dev/null
+++ b/0.bat
@@ -0,0 +1 @@
+wmake\ 2scroll.exe > ..\w\r

diff --git a/data/g.pal b/data/g.pal
index cf668e3..a234f82 100644 (file)
Binary files a/data/g.pal and b/data/g.pal differ

diff --git a/pcxtest.exe b/pcxtest.exe
index f7b77f5..988abb2 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index aa86e66..6d58563 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index eb3f1f3..4ce84b8 100644 (file)
--- 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 41c0a66..2a4987a 100644 (file)
--- 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 b833f7c..8f77a4f 100644 (file)
--- 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
 \r
 #define TILEWH 16\r
 #define QUADWH                 TILEWH/2\r
-#define SPEED 16\r
+#define SPEED 4\r
 //#define LOOPMAX (TILEWH/SPEED)\r
 \r
 //place holder definitions\r
@@ -533,6 +533,74 @@ void main() {
                player.triggery = player.ty-1;\r
        }\r
        //modexClearRegion(mask->page, 66, 66, 2, 40, 0);\r
+
+/*     //right movement\r
+       if((keyp(32) && !keyp(30) && player.d == 0) || player.d == 2)\r
+       {\r
+               if(player.d == 0){ player.d = 2; }\r
+               if(bg->tx >= 0 && bg->tx+20 < map.width)\r
+               {\r
+                       if(player.q<=(TILEWH/SPEED))\r
+                       {
+                               bg->page->dx++;
+                               modexShowPage(bg->page);
+                               player.q++;\r
+                       } else { player.q = 1; player.d = 0; }\r
+               }\r
+//             player.triggerx = player.tx+1;\r
+//             player.triggery = player.ty;\r
+       }\r
+\r
+       //left movement\r
+       if((keyp(30) && !keyp(32) && player.d == 0) || player.d == 4)\r
+       {\r
+               if(player.d == 0){ player.d = 4; }\r
+               if(bg->tx > 0 && bg->tx+20 <= map.width)\r
+               {\r
+                       if(player.q<=(TILEWH/SPEED))\r
+                       {\r
+                               bg->page->dx--;
+                               modexShowPage(bg->page);
+                               player.q++;\r
+                       } else { player.q = 1; player.d = 0; }\r
+               }\r
+               //player.triggerx = player.tx-1;\r
+               //player.triggery = player.ty;\r
+       }\r
+\r
+       //down movement\r
+       if((keyp(31) && !keyp(17) && player.d == 0) || player.d == 3)\r
+       {\r
+               if(player.d == 0){ player.d = 3; }\r
+               if(bg->ty >= 0 && bg->ty+15 < map.height)\r
+               {\r
+                       if(player.q<=(TILEWH/SPEED))\r
+                       {\r
+                               bg->page->dy--;
+                               modexShowPage(bg->page);\r
+                               player.q++;\r
+                       } else { player.q = 1; player.d = 0; }\r
+               }\r
+               //player.triggerx = player.tx;\r
+               //player.triggery = player.ty+1;\r
+       }\r
+\r
+       //up movement\r
+       if((keyp(17) && !keyp(31) && player.d == 0) || player.d == 1)\r
+       {\r
+               if(player.d == 0){ player.d = 1; }\r
+               if(bg->ty > 0 && bg->ty+15 <= map.height)\r
+               {\r
+                       if(player.q<=(TILEWH/SPEED))\r
+                       {\r
+                               bg->page->dy++;
+                               modexShowPage(bg->page);\r
+                               player.q++;\r
+                       } else { player.q = 1; player.d = 0; }\r
+               }\r
+               //player.triggerx = player.tx;\r
+               //player.triggery = player.ty-1;\r
+       }*/
 \r
        if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))\r
        {\r
@@ -546,7 +614,7 @@ void main() {
        if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; }\r
        //if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; }\r
        if(keyp(25)){ pdump(bg); pdump(spri); }\r
-       if(keyp(24)){ modexPalUpdate3(gpal); paloffset=0; pdump(bg); pdump(spri); }\r
+       if(keyp(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg); pdump(spri); }\r
        if(keyp(22)){ \r
        paloffset=0; modexPalBlack(); modexPalUpdate(&ptmp, &paloffset, 0, 0);\r
        printf("1paloffset      =       %d\n", paloffset/3);\r
@@ -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);\r
        //modexCopyPageRegion(dest->page, top->page, 66, 66, 66, 66, 2, 40);\r
        //turn this off if XT\r
-       //if(detectcpu() > 0) modexWaitBorder();\r
+       if(detectcpu() > 0) modexWaitBorder();\r
 }\r

diff --git a/test.exe b/test.exe
index 64cd695..736b224 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 0364d8b..da9ec19 100644 (file)
Binary files a/test2.exe and b/test2.exe differ