trying to fix~ palette updater bug! wwww

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index c7ebff17f76e140910795a763d7740f689a6f8cf..263b66027e6ce2b990eee5e8c17e4cd657cce3ec 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,8 +1,8 @@
-#include "src\lib\dos_kb.h"
-#include "src\lib\mapread.c"\r
+#include "src/lib/dos_kb.h"
+#include "src/lib/mapread.c"\r
 //#include "16\lib\x\modex.h"\r
-#include "src\lib\wtest\wtest.c"\r
-#include "src\lib\planar.c"
+#include "src/lib/wtest/wtest.c"\r
+#include "src/lib/planar.c"
 //====#include "src\lib\ems.c"\r
 \r
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
@@ -73,7 +73,8 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword
 #define TRIGGX 10\r
 #define TRIGGY 9\r
 \r
-void main() {\r
+void main() {
+       size_t oldfreemem=GetFreeSize();\r
        long emmhandle;\r
        long emsavail;\r
        char teststr[80];\r
@@ -104,7 +105,7 @@ void main() {
                printf("Expanded memory manager is not present\n");\r
                exit(0);\r
        }\r
-     \r
+\r
        emsavail = emmavail();\r
        if(emsavail == -1)\r
        {\r
@@ -120,6 +121,7 @@ void main() {
        }*/\r
 
        /* create the map */
+//0000 printf("Total used @ before map load:                   %zu\n", oldfreemem-GetFreeSize());
        loadmap("data/test.map", &map);
 //---- map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
        //if(isEMS()) printf("%d tesuto\n", coretotalEMS());
@@ -132,10 +134,14 @@ void main() {
        ptr = map.data;
        mappalptr = map.tiles->data->palette;
        /* data */
+//0000 printf("Total used @ before image loading:              %zu\n", oldfreemem-GetFreeSize());
        ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
        //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
+       
        /* create the planar buffer */
+//0000 printf("Total used @ before planar buffer creation:     %zu\n", oldfreemem-GetFreeSize());
        p = planar_buf_from_bitmap(&ptmp);\r
+//0000 printf("Total used @ after planar buffer creation:      %zu\n", oldfreemem-GetFreeSize());
 
        /*if(isEMS())\r
        {\r
@@ -172,25 +178,24 @@ void main() {
        dpal = modexNewPal();
        modexPalSave(dpal);
        modexFadeOff(4, dpal);
-       modexPalBlack();
 
        setkb(1);
        modexEnter();
-       modexPalBlack();
+       modexPalBlack();        //reset the palette~
+//     printf("Total used @ before palette initiation:         %zu\n", oldfreemem-GetFreeSize());
        ptmp.offset=(paloffset/3);
        modexPalUpdate(&ptmp, &paloffset, 0, 0);
-       modexClearRegion(bg->page, 0, 0, 320, 240, 255);
        //printf("      %d\n", sizeof(ptmp.data));
        //printf("1:    %d\n", paloffset);
        map.tiles->data->offset=(paloffset/3);
        modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
+       printf("\n====\n");
+       printf("0       paloffset=      %d\n", paloffset/3);
+       printf("====\n\n");
        gpal = modexNewPal();\r
        modexPalSave(gpal);
        modexSavePalFile("data/g.pal", gpal);
-       modexPalBlack();
-       //printf("wwww: %d\n", map.tiles->data->offset);
-       //printf("2:    %d\n", paloffset);
-       //printf("      %d\n", sizeof(map.tiles->data->(*data)));
+       modexPalBlack();        //so player will not see loadings~
 
        /* setup camera and screen~ */
        screen = modexDefaultPage();
@@ -241,6 +246,7 @@ void main() {
        //----modexClearRegion(spri->page, 5*16, 5*16, 16, 16, 255);\r
        //----modexClearRegion(bg->page, 5*16, 5*16, 16, 16, 255);\r
        modexShowPage(spri->page);
+//     printf("Total used @ before loop:                       %zu\n", oldfreemem-GetFreeSize());
        modexFadeOn(4, gpal);\r
        while(!keyp(1) && player.hp>0)\r
        {\r
@@ -540,6 +546,13 @@ 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; }
        if(keyp(25)){ pdump(bg); pdump(spri); }
+       if(keyp(24)){ modexPalUpdate3(gpal); paloffset=0; pdump(bg); pdump(spri); }
+       if(keyp(22)){ 
+       paloffset=0; modexPalBlack(); modexPalUpdate(&ptmp, &paloffset, 0, 0);
+       printf("1paloffset      =       %d\n", paloffset/3);
+        modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
+       printf("2paloffset      =       %d\n", paloffset/3);
+        pdump(bg); pdump(spri); }
 
        if(keyp(87))
        {
@@ -554,8 +567,10 @@ void main() {
        }\r
 \r
        /* fade back to text mode */
+       /* but 1st lets save the game palette~ */
+       modexPalSave(gpal);
+       modexSavePalFile("data/g.pal", gpal);
        modexFadeOff(4, gpal);\r
-       modexPalBlack();\r
        modexLeave();\r
        setkb(0);\r
        //system("mem /E /P");\r
@@ -573,6 +588,8 @@ void main() {
        printf("player.q: %d\n", player.q);\r
        printf("player.d: %d\n", player.d);
        printf("palette offset: %d\n", paloffset/3);
+       printf("Total used: %zu\n", oldfreemem-GetFreeSize());
+       printf("Total free: %zu\n", GetFreeSize());
        printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");\r
        printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");\r
        printf("\n");\r
@@ -590,7 +607,6 @@ void main() {
                default: cpus = "internal error"; break;\r
        }\r
        printf("detected CPU type: %s\n", cpus);
-       modexPalBlack();\r
        modexFadeOn(4, dpal);\r
 }\r
 \r
@@ -873,7 +889,7 @@ void pdump(map_view_t *pee)
                        palcol++;\r
                }\r
        }\r
-}\r
+}
 \r
 void\r
 animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp)\r