wwww

diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c
index 1626fd1dc6fcd1e92d5421e7b3f576ff5d88ff24..8b40f9648f720a0b41a578bd396a67f808235b34 100755 (executable)
--- a/src/lib/bakapee.c
+++ b/src/lib/bakapee.c
@@ -34,7 +34,7 @@ void colortest(page_t *page, bakapee_t *pee)
 {
        //if(pee->coor < 256)
        //{
 {
        //if(pee->coor < 256)
        //{

-               cls(page, pee->coor, VGA);
+               modexcls(page, pee->coor, VGA);

                pee->coor++;
        //}else pee->coor = 0;
 }
                pee->coor++;
        //}else pee->coor = 0;
 }


@@ -44,7 +44,7 @@ void colorz(page_t *page, bakapee_t *pee)
 {
        if(pee->coor <= HGQ)
        {
 {
        if(pee->coor <= HGQ)
        {

-               cls(page, pee->coor, VGA);
+               modexcls(page, pee->coor, VGA);

                pee->coor++;
        }else pee->coor = LGQ;
 }
                pee->coor++;
        }else pee->coor = LGQ;
 }


@@ -228,7 +228,7 @@ void ding(page_t *page, bakapee_t *pee, word q)
                break;
                case 6:
                        pee->coor = rand()%256;
                break;
                case 6:
                        pee->coor = rand()%256;

-                       cls(page, pee->coor, VGA);
+                       modexcls(page, pee->coor, VGA);

                break;
                case 7:
                        if(pee->coor <= HGQ)
                break;
                case 7:
                        if(pee->coor <= HGQ)

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index fcec8d38002ff996c245cc25f783a9b4dce5e261..6f8d64fa64a8810526e373e10e6a203cc9ff9849 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -636,7 +636,7 @@ printf("\nqqqqqqqq\n\n");
                pp = q;\r
                //printf("1(*i)=%02d\n", (*i)/3);\r
                //printf("1z=%02d\n", z/3);\r
                pp = q;\r
                //printf("1(*i)=%02d\n", (*i)/3);\r
                //printf("1z=%02d\n", z/3);\r

-               chkcolor(bmp, &q, &a, &aa, &z, i);\r
+               modexchkcolor(bmp, &q, &a, &aa, &z, i);\r

                //printf("2(*i)=%02d\n", (*i)/3);\r
                //printf("2z=%02d\n", z/3);\r
                aq=0;\r
                //printf("2(*i)=%02d\n", (*i)/3);\r
                //printf("2z=%02d\n", z/3);\r
                aq=0;\r


@@ -753,7 +753,7 @@ modexPalOverscan(byte *p, word col)
 \r
 //color checker~\r
 //i want to make another vesion that checks the palette when the palette is being appened~\r
 \r
 //color checker~\r
 //i want to make another vesion that checks the palette when the palette is being appened~\r

-void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/)\r
+void modexchkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/)\r

 {\r
                byte *pal;\r
                word zz=0;\r
 {\r
                byte *pal;\r
                word zz=0;\r


@@ -1006,7 +1006,7 @@ void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, c
 }\r
 \r
 /* palette dump on display! */\r
 }\r
 \r
 /* palette dump on display! */\r

-void pdump(page_t *pee)\r
+void modexpdump(page_t *pee)\r

 {\r
        int mult=(QUADWH);\r
        int palq=(mult)*TILEWH;\r
 {\r
        int mult=(QUADWH);\r
        int palq=(mult)*TILEWH;\r


@@ -1026,7 +1026,7 @@ void pdump(page_t *pee)
 //              the Virtual screen.                                                                                     //\r
 //                                                                                                                                              //\r
 /////////////////////////////////////////////////////////////////////////////\r
 //              the Virtual screen.                                                                                     //\r
 //                                                                                                                                              //\r
 /////////////////////////////////////////////////////////////////////////////\r

-void cls(page_t *page, byte color, byte *Where)\r
+void modexcls(page_t *page, byte color, byte *Where)\r

 {\r
        //modexClearRegion(page, 0, 0, page->width, page->height, color);\r
        /* set map mask to all 4 planes */\r
 {\r
        //modexClearRegion(page, 0, 0, page->width, page->height, color);\r
        /* set map mask to all 4 planes */\r

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 6b8622f1a0983d7574be0a9971cf706777639def..acdf63e940fffbec392c7748c6bd1a6eb1303943 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -120,14 +120,14 @@ void modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset);
 void modexPalUpdate1(byte *p);
 void modexPalUpdate0(byte *p);
 void modexPalOverscan(byte *p, word col);
 void modexPalUpdate1(byte *p);
 void modexPalUpdate0(byte *p);
 void modexPalOverscan(byte *p, word col);

-void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/);
+void modexchkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/);

 void modexputPixel(page_t *page, int x, int y, byte color);
 byte modexgetPixel(page_t *page, int x, int y);
 void modexhlin(page_t *page, word xl, word xh, word y, word color);
 void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str, boolean q);
 void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str);
 void modexputPixel(page_t *page, int x, int y, byte color);
 byte modexgetPixel(page_t *page, int x, int y);
 void modexhlin(page_t *page, word xl, word xh, word y, word color);
 void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str, boolean q);
 void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str);

-void pdump(page_t *pee);
-void cls(page_t *page, byte color, byte *Where);
+void modexpdump(page_t *pee);
+void modexcls(page_t *page, byte color, byte *Where);

 //void modexWaitBorder();
 
 /* -======================= Constants & Vars ==========================- */
 //void modexWaitBorder();
 
 /* -======================= Constants & Vars ==========================- */

diff --git a/src/palettel.c b/src/palettel.c
index d07452b6dc8c7edab50b0de2cd743531e33b7960..5ce5c809c2c6bf7efca575f76156541eb979c651 100755 (executable)
--- a/src/palettel.c
+++ b/src/palettel.c
@@ -45,7 +45,7 @@ main(int argc, char *argv[])
        modexLoadPalFile(bakapee, &pal);\r
        modexPalUpdate1(pal);\r
        modexFadeOn(1, pal);\r
        modexLoadPalFile(bakapee, &pal);\r
        modexPalUpdate1(pal);\r
        modexFadeOn(1, pal);\r

-       pdump(&gvar.video.page[0]);\r
+       modexpdump(&gvar.video.page[0]);\r

        getch();\r
        VGAmodeX(0, 0, &gvar);\r
        modexPalUpdate1(pal);\r
        getch();\r
        VGAmodeX(0, 0, &gvar);\r
        modexPalUpdate1(pal);\r

diff --git a/src/scroll.c b/src/scroll.c
index b7ecc00b3210f46089289e2578131b90feafb738..e619bfa33338dee813a2e4483d99fddf2385e94e 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -369,16 +369,16 @@ void main(int argc, char *argv[])
        if(IN_KeyDown(2)){ modexShowPage(bg->page); panpagenum=0; }
        if(IN_KeyDown(3)){ modexShowPage(spri->page); panpagenum=1; }
        if(IN_KeyDown(4)){ modexShowPage(mask->page); panpagenum=2; }
        if(IN_KeyDown(2)){ modexShowPage(bg->page); panpagenum=0; }
        if(IN_KeyDown(3)){ modexShowPage(spri->page); panpagenum=1; }
        if(IN_KeyDown(4)){ modexShowPage(mask->page); panpagenum=2; }

-       if(IN_KeyDown(25)){ pdump(bg->page); pdump(spri->page); }       //p
+       if(IN_KeyDown(25)){ modexpdump(bg->page); modexpdump(spri->page); }     //p

 #ifdef MODEX
 #ifdef FADE
 #ifdef MODEX
 #ifdef FADE

-       if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg->page); pdump(spri->page); }
+       if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(bg->page); modexpdump(spri->page); }

        if(IN_KeyDown(22)){
        paloffset=0; modexPalBlack(); modexPalUpdate(&player[0].data, &paloffset, 0, 0);
        printf("1paloffset      =       %d\n", paloffset/3);
         modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
        printf("2paloffset      =       %d\n", paloffset/3);
        if(IN_KeyDown(22)){
        paloffset=0; modexPalBlack(); modexPalUpdate(&player[0].data, &paloffset, 0, 0);
        printf("1paloffset      =       %d\n", paloffset/3);
         modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
        printf("2paloffset      =       %d\n", paloffset/3);

-        pdump(bg->page); pdump(spri->page); }
+        modexpdump(bg->page); modexpdump(spri->page); }

 #endif
 #endif
        //pan switch
 #endif
 #endif
        //pan switch