palette is now arrays

diff --git a/src/lib/ems.c b/16/othersrc/lib/ems.c
similarity index 100%
rename from src/lib/ems.c
rename to 16/othersrc/lib/ems.c

diff --git a/src/lib/ems.h b/16/othersrc/lib/ems.h
similarity index 100%
rename from src/lib/ems.h
rename to 16/othersrc/lib/ems.h

diff --git a/src/lib/midi.c b/16/othersrc/lib/midi.c
similarity index 100%
rename from src/lib/midi.c
rename to 16/othersrc/lib/midi.c

diff --git a/src/lib/midi.h b/16/othersrc/lib/midi.h
similarity index 100%
rename from src/lib/midi.h
rename to 16/othersrc/lib/midi.h

diff --git a/src/lib/tst.c b/16/othersrc/lib/tst.c
similarity index 100%
rename from src/lib/tst.c
rename to 16/othersrc/lib/tst.c

diff --git a/src/lib/xms.c b/16/othersrc/lib/xms.c
similarity index 100%
rename from src/lib/xms.c
rename to 16/othersrc/lib/xms.c

diff --git a/src/lib/xms.h b/16/othersrc/lib/xms.h
similarity index 100%
rename from src/lib/xms.h
rename to 16/othersrc/lib/xms.h

diff --git a/src/midi.c b/16/othersrc/midi.c
similarity index 100%
rename from src/midi.c
rename to 16/othersrc/midi.c

diff --git a/src/testemm.c b/16/othersrc/testemm.c
similarity index 100%
rename from src/testemm.c
rename to 16/othersrc/testemm.c

diff --git a/src/testemm0.c b/16/othersrc/testemm0.c
similarity index 100%
rename from src/testemm0.c
rename to 16/othersrc/testemm0.c

diff --git a/src/tsthimem.c b/16/othersrc/tsthimem.c
similarity index 100%
rename from src/tsthimem.c
rename to 16/othersrc/tsthimem.c

diff --git a/makefile b/makefile
index 9440b2da39208c01a077f842aad11e8802a07632..5ebf3d5cde95bcaedb28a3b98ab16ba185439be4 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -123,7 +123,7 @@ LIBFLAGS=$(WLIBQ) -b -n
 # objects
 #
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
-OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
+#OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
 GFXLIBOBJS = 16_vl.$(OBJ) 16_vlpal.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_spri.$(OBJ) $(OLDLIBOBJS)
 16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ) 16_enti.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
@@ -182,13 +182,13 @@ TESTEXEC = &
        0.exe &
        exmmtest.exe &
        vgmtest.exe &
-       scroll.exe &
        zcroll.exe &
        inputest.exe &
-       pcxtest.exe &
        vrstest.exe &
        maptest.exe
 TESTEXEC2 = &
+       pcxtest.exe &
+       scroll.exe &
        fmemtest.exe &
        fonttest.exe &
        fontgfx.exe &

diff --git a/src/16.c b/src/16.c
index d2072fcb1c640eb485325e2654563f150948d768..9877b7df58a93f429d6e7daad82228275f8a5997 100755 (executable)
--- a/src/16.c
+++ b/src/16.c
@@ -23,7 +23,6 @@
 #include "src/16.h"\r
 \r
 engi_stat_t engi_stat;\r
-byte *dpal, *gpal;\r
 player_t player[MaxPlayers];\r
 \r
 void\r
@@ -35,12 +34,10 @@ main(int argc, char *argv[])
        engi_stat = ENGI_RUN;\r
 \r
        /* save the palette */\r
-       dpal = modexNewPal();\r
-       modexPalSave(dpal);\r
-       modexFadeOff(4, dpal);\r
-       gpal = modexNewPal();\r
-       modexPalSave(gpal);\r
-       modexSavePalFile("data/g.pal", gpal);\r
+       modexPalSave(gvar.video.dpal);\r
+       modexFadeOff(4, gvar.video.dpal);\r
+       modexPalSave(gvar.video.palette);\r
+       modexSavePalFile("data/g.pal", gvar.video.palette);\r
        VGAmodeX(1, 1, &gvar);\r
 //     modexPalBlack();        //so player will not see loadings~\r
        IN_Default(0,&player,ctrl_Joystick);\r
@@ -57,5 +54,5 @@ main(int argc, char *argv[])
        printf("Project 16 16.exe. This is supposed to be the actual finished game executable!\n");\r
        printf("version %s\n", VERSION);\r
        WCPU_cpufpumesg();\r
-       modexFadeOn(4, dpal);\r
+       modexFadeOn(4, gvar.video.dpal);\r
 }\r

diff --git a/src/fontgfx.c b/src/fontgfx.c
index 1fc19b2468577e18d977dd09e2bc6a7837e33e0f..98639c33c528bec43f5b79b4a58f4a0d2e927e30 100755 (executable)
--- a/src/fontgfx.c
+++ b/src/fontgfx.c
@@ -128,8 +128,6 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
 //     modexprint(0, 0, 1, 0, colpee, ROSE);\r
 //++++ getch();\r
        VGAmodeX(0, 1, &gvar);\r
-//     rosa=malloc(sizeof(ROSE));\r
-//     (*rosa)=(byte)ROSE;\r
        printf("\n%s\n", rose);\r
        //printf("\nh=%d\n", '8');\r
 //     printf("\n%c\n", e);\r

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index e6a5a1d15653f17135c0e82f794324e50a23f20e..3b1d7d72ae05908ff8341ea63afe715128c6d59f 100755 (executable)
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -223,7 +223,7 @@ int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar)
        file_s = filesize(fh);\r
        CA_LoadFile(mn, &MAPBUFINLM, gvar);\r
        tokcount = jsmn_parse(&p, MAPBUFINLM, file_s, NULL, 0);\r
-       tok = malloc(tokcount*sizeof(jsmntok_t));//TODO: USE MM_ CA_ AND PM_\r
+       tok = malloc(tokcount*sizeof(jsmntok_t));\r
 //     printf("Allocated %d tokens", tokcount);\r
        jsmn_init(&p);\r
        if((status = jsmn_parse(&p, MAPBUFINLM, file_s, tok, tokcount)) < 0)\r

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index b30f9df8fd3eddea5783818155d8dc2abee086a4..51e1ee1362155c1795447538cbaea8d6c79f4015 100755 (executable)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -22,7 +22,6 @@
 #define __16_MM__\r
 \r
 #include <string.h>\r
-#include <malloc.h>\r
 #include "src/lib/16_head.h"\r
 #include "src/lib/16_hc.h"\r
 #include "src/lib/16_tail.h"\r

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index af4b0d7e1c4616043370285606731fc2b09e11e0..447bfbf61dbc6e2052c171509da13ce17de313b4 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -91,7 +91,7 @@ typedef struct sprite
 \r
 //TODO: 16_mm and 16_ca must handle this\r
 typedef struct {\r
-       bitmap_t far *pcximg;           // old\r
+//     bitmap_t far *pcximg;           // old\r
 #ifdef __WATCOMC__\r
        sprite_t *spri;                 // I will probibaly use this --sparky4\r
 #endif\r
@@ -141,9 +141,9 @@ typedef struct {
        word sh;                /* screen heigth */     /* resolution */\r
        word width;             /* virtual width of the page */\r
        word height;    /* virtual height of the page */\r
-       word stridew;                   /* width/4 */   /* VGA */\r
-       word pagesize;                  /* page size */\r
-       word pi;                                /* increment page by this much to preserve location */\r
+       word stridew;   /* width/4 */   /* VGA */\r
+       word pagesize;  /* page size */\r
+       word pi;                /* increment page by this much to preserve location */\r
        int tlx,tly;\r
 //newer vars\r
 //TODO: find where they are used\r
@@ -237,8 +237,8 @@ typedef     struct
        //struct sprite *spri;  //supposively the sprite sheet data\r
        memptr          gr;\r
 #endif\r
-       bitmap_t        *data;          //supposively the sprite sheet data//old format\r
-       bitmap_t        bmp;\r
+//     bitmap_t        *data;          //supposively the sprite sheet data//old format\r
+//     bitmap_t        bmp;\r
 \r
        //input\r
        byte near               pdir;   //previous direction~ used in IN_16 in IN_ReadControl()\r
@@ -268,18 +268,20 @@ typedef struct
        nibble wcpu;    //stored value of cpu type\r
 } kurokku_t;\r
 \r
+//===================================//\r
+#define     PALSIZE            768\r
+#define NUMCHUNKS      416     //keen\r
 //video\r
 typedef struct\r
 {\r
        unsigned int offscreen_ofs;\r
        unsigned int pattern_ofs;\r
-} ofs_t;\r
-#define NUMCHUNKS      416     //keen\r
+} ofs_t;       //unfinished\r
 \r
 typedef struct\r
 {\r
        char old_mode;          //old video mode before game!\r
-       byte palette[768];              //palette array\r
+       byte palette[PALSIZE], dpal[PALSIZE];   //palette array\r
        page_t page[MAXPAGE];   //can be used as a pointer to root page[0]\r
        word vmem_remain;       //remaining video memory\r
        byte num_of_pages;      //number of actual pages\r

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index f241fb6ebbe0ebc0c9313c70e7d931c2ce8f157c..2e5fa42e184eb9d6ed18da64adc0fc4a1abe8503 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -644,41 +644,39 @@ modexPalSave(byte *palette) {
 }\r
 \r
 \r
-byte *\r
+/*byte *\r
 modexNewPal() {\r
        byte *ptr;\r
-       ptr = malloc(PAL_SIZE);\r
+       ptr = m a l l o c(PAL_SIZE);\r
 \r
-       /* handle errors */\r
+       // handle errors\r
        if(!ptr) {\r
                printf("Could not allocate palette.\n");\r
        }\r
 \r
        return ptr;\r
-}\r
+}*/\r
 \r
 \r
 void\r
-modexLoadPalFile(byte *filename, byte **palette) {\r
+modexLoadPalFile(byte *filename, byte *palette) {\r
        FILE *file;\r
        byte *ptr;\r
 \r
-       /* free the palette if it exists */\r
-       if(*palette) {\r
-       free(*palette);\r
-       }\r
+       // free the palette if it exists\r
+       //if(*palette) { free(*palette); }\r
 \r
-       /* allocate the new palette */\r
-       *palette = modexNewPal();\r
+       // allocate the new palette\r
+       //*palette = modexNewPal();\r
 \r
-       /* open the file */\r
+       // open the file\r
        file = fopen(filename, "rb");\r
        if(!file) {\r
-       printf("Could not open palette file: %s\n", filename);\r
+               printf("Could not open palette file: %s\n", filename);\r
        }\r
 \r
        /* read the file */\r
-       ptr = *palette;\r
+       ptr = palette;\r
        while(!feof(file)) {\r
        *ptr++ = fgetc(file);\r
        }\r

diff --git a/src/lib/16_vl.h b/src/lib/16_vl.h
index 93780c516826e43d1f42e9472d6229cf9b284059..d113825e951eafc315d56b8f4134a7a3e2af5095 100755 (executable)
--- a/src/lib/16_vl.h
+++ b/src/lib/16_vl.h
@@ -58,7 +58,6 @@
 #define PAGE_OFFSET(x,y) (((y)<<6)+((y)<<4)+((x)>>2))\r
 #define PLANE(x) (1 << ((x) & 3))\r
 #define SELECT_ALL_PLANES() outpw(0x03c4, 0xff02)\r
-#define     PALSIZE            768\r
 \r
 typedef union\r
 {\r
@@ -122,8 +121,8 @@ void modexFlashOff(word fade, byte *palette);
 \r
 /* palette loading and saving */\r
 void modexPalSave(byte *palette);\r
-byte *modexNewPal();\r
-void modexLoadPalFile(char *filename, byte **palette);\r
+//byte *modexNewPal();\r
+void modexLoadPalFile(char *filename, byte *palette);\r
 void VL_LoadPalFile(const char *filename, byte *palette);\r
 void VL_LoadPalFilewithoffset(const char *filename, byte *palette, word o);\r
 void VL_UpdatePaletteWrite(byte *palette, word o);\r

diff --git a/src/lib/16_vlpal.c b/src/lib/16_vlpal.c
index 2f155f03a43256587a2878aa9c913be79be9d6ab..032f2b7a947c7b875ae0a9daba44d01353bd73e2 100755 (executable)
--- a/src/lib/16_vlpal.c
+++ b/src/lib/16_vlpal.c
@@ -24,12 +24,12 @@
 \r
 //color checker~\r
 //i want to make another vesion that checks the palette when the palette is being appened~\r
-void modexchkcolor(imgtestpal_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/)\r
+void modexchkcolor(imgtestpal_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/, global_game_variables_t *gv)\r
 {\r
-               byte *pal;\r
+               byte *pal=&(gv->video.palette);\r
                word zz=0;\r
-               pal = modexNewPal();\r
-               modexPalSave(pal);\r
+               //pal = modexNewPal();\r
+//             modexPalSave(pal);\r
                CHKCOLDBGOUT1\r
                //check palette for dups\r
                for(; (*z)<PAL_SIZE; (*z)+=3)\r
@@ -93,7 +93,7 @@ no... wait.... no wwww
 }\r
 \r
 void\r
-VL_palette(imgtestpal_t *bmp, byte *p, word *i, word qp, word aqoffset)\r
+VL_palette(imgtestpal_t *bmp, byte *p, word *i, word qp, word aqoffset, global_game_variables_t *gv)\r
 {\r
        //byte *p = bmp->palette;\r
        word w=0;\r
@@ -179,7 +179,7 @@ VL_palette(imgtestpal_t *bmp, byte *p, word *i, word qp, word aqoffset)
                printf("1(*i)=%02d\n", (*i)/3);//\r
                printf("1z=%02d\n", z/3);//\r
 #endif\r
-               modexchkcolor(bmp, &q, &a, &aa, &z, i);\r
+               modexchkcolor(bmp, &q, &a, &aa, &z, i, gv);\r
 #ifdef BEVERBOSEPALCHECK\r
                printf("2(*i)=%02d\n", (*i)/3);\r
                printf("2z=%02d\n", z/3);\r
@@ -253,7 +253,7 @@ printf("              aq=%02d\n", aq);//
 printf("                 aa=%02d\n", aa);//\r
 #endif\r
        //update the palette~\r
-       VL_palette(bmp, p, &pp, aq, aqoffset);\r
+       VL_palette(bmp, p, &pp, aq, aqoffset, gv);\r
        (*i)=pp;\r
 \r
        if(aq<aa){ pp=q; aq++; goto aqpee; }\r

diff --git a/src/lib/16_vlpal.h b/src/lib/16_vlpal.h
index f97c4fd4e4d905ab95c2a03787912a14ff1be845..1ff20b6d3ad19bdb3305209d20f3f2811a08cff1 100755 (executable)
--- a/src/lib/16_vlpal.h
+++ b/src/lib/16_vlpal.h
@@ -12,9 +12,8 @@ typedef struct
        word offset;\r
 } imgtestpal_t;\r
 \r
-void VL_modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqpp);\r
-void VL_palette(imgtestpal_t *bmp, byte *p, word *i, word qp, word aqoffset);\r
-//void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z);\r
+void VL_modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqpp, global_game_variables_t *gv);\r
+void VL_palette(imgtestpal_t *bmp, byte *p, word *i, word qp, word aqoffset, global_game_variables_t *gv);\r
 \r
 \r
 #endif //__16_VLPAL_H__\r

diff --git a/src/lib/doslib b/src/lib/doslib
index 73d44631cbd6ff2e577fd1fa9a12750ebbcd8c54..b5e32a4835387e8e658b6b0167399a937db53c66 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 73d44631cbd6ff2e577fd1fa9a12750ebbcd8c54
+Subproject commit b5e32a4835387e8e658b6b0167399a937db53c66

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 5f7ae115358fb296d562b2170bcfb9a9597c34dc..fdd675a151530682cdeb48fdcfed6ea5563a9535 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -568,8 +568,6 @@ void near
 mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)\r
 {\r
        word rx, ry;\r
-       //word textx=0, texty=0;\r
-       //if(i==0) i=2;\r
 //     printf("%02d ", i); if(x >= page->width - t->tileWidth) printf("\n");\r
        switch(i)\r
        {\r
@@ -578,8 +576,8 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
                        modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 1); //currently the over scan color!\r
                break;\r
                default:\r
-                       rx = (((i-1) % ((t->pcximg->width)/t->tileWidth)) * t->tileWidth);\r
-                       ry = (((i-1) / ((t->pcximg->height)/t->tileHeight)) * t->tileHeight);\r
+                       rx = (((i-1) % ((t->spri->sprite_vrl_cont->vrl_header->width)/t->tileWidth)) * t->tileWidth);\r
+                       ry = (((i-1) / ((t->spri->sprite_vrl_cont->vrl_header->height)/t->tileHeight)) * t->tileHeight);\r
 #ifndef TILERENDER\r
                        if(!pagenorendermap) modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, i+1);\r
 #else\r

diff --git a/src/palettec.c b/src/palettec.c
index 3864b677d79cc9e169392540b5877fa7ceb1d90b..8f1ed3e7758121a4bc9ae5a81945320ec817608c 100755 (executable)
--- a/src/palettec.c
+++ b/src/palettec.c
@@ -26,8 +26,7 @@ void
 main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
-       byte *pal;\r
-       byte *bakapee;\r
+       char *bakapee;\r
 \r
        bakapee = malloc(64);\r
        if(argv[1]) bakapee = argv[1];\r
@@ -35,11 +34,11 @@ main(int argc, char *argv[])
 \r
        VGAmodeX(1, 1, &gvar);\r
 \r
-       pal = modexNewPal();\r
-       modexPalSave(pal);\r
+       modexPalSave(&(gvar.video.palette));\r
 \r
-       modexSavePalFile(bakapee, pal);\r
+       modexSavePalFile(bakapee, &(gvar.video.palette));\r
 \r
        VGAmodeX(0, 1, &gvar);\r
+       free(bakapee);\r
 \r
 }\r

diff --git a/src/palettel.c b/src/palettel.c
index e7f2ace0fc3323edfe92fe0d46a260252e2f0a93..1a487bab82f39219d962e86b4be6d0bfe91fb88e 100755 (executable)
--- a/src/palettel.c
+++ b/src/palettel.c
@@ -23,7 +23,6 @@
 #include "src/lib/16_vl.h"\r
 #include "src/lib/bakapee.h"\r
 \r
-byte *pal;\r
 char *bakapee;\r
 word i;\r
 \r
@@ -31,26 +30,24 @@ void
 main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
-       //page.width += 32;\r
-       //page.height += 32;\r
-       pal = modexNewPal();\r
        bakapee = malloc(64);\r
        if(argv[1]) bakapee = argv[1];\r
        else bakapee = "data/default.pal";\r
-//     modexPalSave(pal);\r
+       modexPalSave(&(gvar.video.palette));\r
        VGAmodeX(1, 1, &gvar);\r
        gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);\r
        modexPalBlack();\r
 \r
-       modexLoadPalFile(bakapee, &pal);\r
-       modexPalUpdate(pal);\r
-       modexFadeOn(1, pal);\r
+       modexLoadPalFile(bakapee, &(gvar.video.palette));\r
+       modexPalUpdate(&(gvar.video.palette));\r
+       modexFadeOn(1, &(gvar.video.palette));\r
        modexpdump(&gvar.video.page[0]);\r
        getch();\r
        VGAmodeX(0, 0, &gvar);\r
-       modexPalUpdate(pal);\r
+       modexPalUpdate(&(gvar.video.palette));\r
        /*for(i=0;i<768;i++)\r
        {\r
                printf("%02X ", pal[i]);\r
        }*/\r
+       free(bakapee);\r
 }\r

diff --git a/src/scroll.c b/src/scroll.c
index 61668d6c2a423f581e4a50767cae5685575ad361..36a7370c2fa96bfcc23fe33cac557dcda0f90455 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -38,9 +38,8 @@ extern boolean pagenorendermap;
 unsigned int i;\r
 //#ifdef FADE\r
        static word paloffset=0;\r
-       byte *dpal;\r
+       byte *gvar.video.dpal;\r
 //#endif\r
-       byte *gpal;\r
 //     byte *ptr;\r
        byte *mappalptr;\r
 \r
@@ -75,9 +74,9 @@ void main(int argc, char *argv[])
        /* save the palette */\r
 #ifdef MODEX\r
 #ifdef FADE\r
-       dpal = modexNewPal();\r
-       modexPalSave(dpal);\r
-       modexFadeOff(4, dpal);\r
+       gvar.video.dpal = modexNewPal();\r
+       modexPalSave(gvar.video.dpal);\r
+       modexFadeOff(4, gvar.video.dpal);\r
 #endif\r
 \r
        VGAmodeX(bakapee, 1, &gvar);\r
@@ -100,9 +99,9 @@ void main(int argc, char *argv[])
 //     printf("====\n\n");\r
 #ifdef MODEX\r
 #ifdef FADE\r
-       gpal = modexNewPal();\r
-       modexPalSave(gpal);\r
-       modexSavePalFile("data/g.pal", gpal);\r
+       &gvar.video.palette = modexNewPal();\r
+       modexPalSave(&gvar.video.palette);\r
+       modexSavePalFile("data/g.pal", &gvar.video.palette);\r
        modexPalBlack();        //so player will not see loadings~\r
 #endif\r
 #endif\r
@@ -123,11 +122,11 @@ void main(int argc, char *argv[])
        if (gvar.video.sprifilei == -1)\r
        {\r
 #ifdef FADE\r
-               modexFadeOff(4, gpal);\r
+               modexFadeOff(4, &gvar.video.palette);\r
 #endif\r
                Quit(&gvar, "Wrong");\r
 #ifdef FADE\r
-               modexFadeOn(4, dpal);\r
+               modexFadeOn(4, gvar.video.dpal);\r
 #endif\r
        }\r
 \r
@@ -159,7 +158,7 @@ void main(int argc, char *argv[])
 \r
 #ifdef MODEX\r
 #ifdef FADE\r
-       modexFadeOn(4, gpal);\r
+       modexFadeOn(4, &gvar.video.palette);\r
 #endif\r
 #endif\r
        while(!IN_KeyDown(sc_Escape) && player[0].enti.hp>0)\r
@@ -193,7 +192,7 @@ void main(int argc, char *argv[])
        //debugging binds!\r
 #ifdef MODEX\r
 #ifdef FADE\r
-       if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); } //p\r
+       if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); } //p\r
        /*if(IN_KeyDown(22)){\r
        paloffset=0; modexPalBlack(); modexPalUpdate(PCXBMPVAR, &paloffset, 0, 0);\r
        printf("1paloffset      =       %d\n", paloffset/3);\r
@@ -220,7 +219,7 @@ void main(int argc, char *argv[])
 \r
        //9\r
 #ifdef FADE\r
-               if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(dpal); IN_UserInput(1,1); }\r
+               if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1,1); }\r
 #endif\r
                if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
 \r
@@ -231,9 +230,9 @@ void main(int argc, char *argv[])
        /* but 1st lets save the game palette~ */\r
 #ifdef MODEX\r
 #ifdef FADE\r
-       modexPalSave(gpal);\r
-       modexSavePalFile("data/g.pal", gpal);\r
-       modexFadeOff(4, gpal);\r
+       modexPalSave(&gvar.video.palette);\r
+       modexSavePalFile("data/g.pal", &gvar.video.palette);\r
+       modexFadeOff(4, &gvar.video.palette);\r
 #endif\r
        VGAmodeX(0, 1, &gvar);\r
 #endif\r
@@ -244,7 +243,7 @@ void main(int argc, char *argv[])
        WCPU_cpufpumesg();\r
 #ifdef MODEX\r
 #ifdef FADE\r
-       modexFadeOn(4, dpal);\r
+       modexFadeOn(4, gvar.video.dpal);\r
 #endif\r
 #endif\r
 }\r

diff --git a/src/test.c b/src/test.c
index 6d130170cf2a3743401cd5eeba4456e626b96cf4..2885dc4666e8bbeee42f55a2d9ff128d7fd75b15 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -30,7 +30,6 @@
 #define HGQ 55\r
 \r
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
-static byte *palette;//[PAL_SIZE];\r
 \r
 void main(int argc, char *argv[])\r
 {\r
@@ -84,7 +83,6 @@ void main(int argc, char *argv[])
        Startup16(&gvar);\r
 \r
        /* save the palette */\r
-       palette = modexNewPal();\r
        //====modexPalSave(pal);\r
        //====modexFadeOff(1, pal);\r
        //====modexPalBlack();\r
@@ -99,12 +97,12 @@ void main(int argc, char *argv[])
        /* load our palette */\r
        VL_LoadPalFile("data/16.pal", &gvar.video.palette);\r
        bmp1.offset=(paloffset/3);\r
-       VL_palette(&bmp1, &gvar.video.palette, &paloffset, 0, 0);\r
+       VL_palette(&bmp1, &gvar.video.palette, &paloffset, 0, 0, &gvar);\r
 \r
        //VL_LoadPalFilewithoffset("data/default.pal", &palette, paloffset);\r
-       modexLoadPalFile("data/16t.pal", &palette);\r
+       modexLoadPalFile("data/16t.pal", &gvar.video.dpal);\r
        bmp2.offset=(paloffset/3);\r
-       VL_palette(&bmp2, palette, &paloffset, 0, 0);\r
+       VL_palette(&bmp2, &gvar.video.dpal, &paloffset, 0, 0, &gvar);\r
        //====modexLoadPalFile("data/default.pal", &pal2);\r
 \r
        /* overscan show */\r

diff --git a/src/zcroll.c b/src/zcroll.c
index 015493e37ee92fb4969ccc686437d5c9df5119b6..6d38a789d041327531d045d90788873c83e29062 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -39,9 +39,7 @@ unsigned int i;
 \r
 #ifdef FADE\r
 //static word paloffset=0;\r
-byte *dpal;\r
 #endif\r
-byte *gpal;\r
 byte *ptr;\r
 memptr pal;\r
 \r
@@ -96,9 +94,8 @@ void main(int argc, char *argv[])
 \r
        // save the palette\r
 #ifdef FADE\r
-       dpal = modexNewPal();\r
-       modexPalSave(dpal);\r
-       modexFadeOff(4, dpal);\r
+       modexPalSave(&gvar.video.dpal);\r
+       modexFadeOff(4, &gvar.video.dpal);\r
        modexPalBlack();\r
 #endif\r
 \r
@@ -116,9 +113,8 @@ void main(int argc, char *argv[])
        //VL_LoadPalFile("data/default.pal", &gvar.video.palette);\r
 \r
 #ifdef FADE\r
-       gpal = modexNewPal();\r
-       modexPalSave(gpal);\r
-       modexSavePalFile("data/g.pal", gpal);\r
+       modexPalSave(&gvar.video.palette);\r
+       modexSavePalFile("data/g.pal", &gvar.video.palette);\r
        modexPalBlack();        //so player will not see loadings~\r
 #endif\r
 \r
@@ -136,11 +132,11 @@ void main(int argc, char *argv[])
        if (gvar.video.sprifilei == -1)\r
        {\r
 #ifdef FADE\r
-               modexFadeOff(4, gpal);\r
+               modexFadeOff(4, &gvar.video.palette);\r
 #endif\r
                Quit(&gvar, "Wrong ID for sprite");\r
 #ifdef FADE\r
-               modexFadeOn(4, dpal);\r
+               modexFadeOn(4, &gvar.video.dpal);\r
 #endif\r
        }\r
 \r
@@ -150,7 +146,7 @@ void main(int argc, char *argv[])
        shinku(&gvar);\r
 //modexpdump(mv[0].page);\r
 #ifdef FADE\r
-       modexFadeOn(4, gpal);\r
+       modexFadeOn(4, &gvar.video.palette);\r
 #endif\r
        while(!IN_KeyDown(sc_Escape) && player[0].enti.hp>0)\r
        {\r
@@ -210,7 +206,7 @@ void main(int argc, char *argv[])
                        VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
                }//JK\r
 #ifdef FADE\r
-               if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(dpal); IN_UserInput(1,1); }\r
+               if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1,1); }\r
 #endif\r
                if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
 \r
@@ -220,9 +216,9 @@ void main(int argc, char *argv[])
        /* fade back to text mode */\r
        /* but 1st lets save the game palette~ */\r
 #ifdef FADE\r
-       modexPalSave(gpal);\r
-       modexSavePalFile("data/g.pal", gpal);\r
-       modexFadeOff(4, gpal);\r
+       modexPalSave(&gvar.video.palette);\r
+       modexSavePalFile("data/g.pal", &gvar.video.palette);\r
+       modexFadeOff(4, &gvar.video.palette);\r
 #endif\r
        Shutdown16(&gvar);\r
        printf("\nProject 16 zcroll.exe. This is just a test file!\n");\r
@@ -230,6 +226,6 @@ void main(int argc, char *argv[])
        SCROLLEXITMESG;\r
        WCPU_cpufpumesg();\r
 #ifdef FADE\r
-       modexFadeOn(4, dpal);\r
+       modexFadeOn(4, gvar.video.dpal);\r
 #endif\r
 }\r