16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / src / lib / 16_mm.c

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 75fc0d9a9e5ce1f9c82e9132e98383fb39c26f69..b6d2a26743327cbd250e565f91fbe225b9f33fa5 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -936,13 +936,14 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar)
        gvar->mm.mmnew->useptr = baseptr;\r
        //if(gvar->mm.mmnew->useptr==NULL){\r
 #ifdef __DEBUG_MM__\r
+       printf("MM_GetPtr\n");\r
        if(dbg_debugmm>0){\r
-               printf("MM_GetPtr\n");\r
                //%04x\r
                printf("        baseptr=%Fp     ", baseptr); printf("useptr=%Fp\n", gvar->mm.mmnew->useptr);\r
                printf("        *baseptr=%Fp    ", *baseptr); printf("*useptr=%Fp\n", *(gvar->mm.mmnew->useptr));\r
                printf("        &baseptr=%Fp    ", &baseptr); printf("&useptr=%Fp\n", &(gvar->mm.mmnew->useptr));\r
        }\r
+       printf("        size is %lu\n", size);\r
 #endif\r
        //Quit(gvar, "gvar->mm.mmnew->useptr==NULL"); }\r
        gvar->mm.mmnew->attributes = BASEATTRIBUTES;\r
@@ -1320,13 +1321,12 @@ void MM_ShowMemory (global_game_variables_t *gvar)
                scaninfo[q].y = y;\r
                VW_Hlin(x,x+end,y,color,gvar);\r
                VL_Plot(x,y,5,gvar);\r
+//++==++==optional                     strcat(scratch0, AARESET); strcat(scratch0, AAGREY); strcat(scratch0,"_");\r
                for(w=(scan->start)/80;w<=end/80;w++)\r
                {\r
 //printf("+    %u      %lu\n", w, scan->length);\r
                        strcat(scratch0, "+");\r
                }\r
-               //++==++==optional\r
-               strcat(scratch0, AARESET); strcat(scratch0, AAGREY); strcat(scratch0,"_");\r
 \r
                if (scan->next && scan->next->start > end+1)\r
                {\r
@@ -1426,6 +1426,7 @@ void MM_ShowMemory (global_game_variables_t *gvar)
 #endif\r
 #ifdef MMSMSCANINFO\r
        {\r
+               byte scratch1[4];\r
                unsigned                maxq = q;\r
                boolean                 done;\r
                ScanCode                scancode;\r
@@ -1438,13 +1439,20 @@ void MM_ShowMemory (global_game_variables_t *gvar)
                        if(scaninfo[qq].scan->attributes & PURGEBITS)\r
                        {\r
                                ccolor = 6;             // dark purple = purgable\r
+                               strcpy(scratch1, AAMAGENTA);            // dark purple = purgable\r
+                               //printf("%s", AAMAGENTA);\r
                        }else{\r
                                ccolor = 2;             // medium blue = non purgable\r
+                               strcpy(scratch1, AABLUE);               // medium blue = non purgable\r
+                               //printf("%s", AABLUE);\r
                        }\r
                        if(scaninfo[qq].scan->attributes & LOCKBIT)\r
                        {\r
                                ccolor = 1;             // red = locked\r
+                               strcpy(scratch1, AARED);                // red = locked\r
+                               //printf("%s", AARED);\r
                        }\r
+                       end = scaninfo[qq].scan->length-1;\r
 /*typedef struct mmblockstruct{\r
        word    start,length;\r
        unsigned        attributes;\r
@@ -1453,27 +1461,64 @@ void MM_ShowMemory (global_game_variables_t *gvar)
 } mmblocktype;*/\r
                        //modexprint(page, x, y, t, tlsw, color, bgcolor, vidsw, const byte *str);\r
 #define MMSMPRINTMEMINFO modexprint(&(gvar->video.page[0]), xpos, ypos, 1, 0, ccolor, 8, gvar->video.VL_Started, global_temp_status_text); ypos+=8;\r
-                       VL_ShowPage(&gvar->video.page[0], 1, 0);\r
                        if(!gvar->video.VL_Started) clrscr(); else\r
                        {\r
+                               VL_ShowPage(&gvar->video.page[0], 1, 0);\r
                                modexClearRegion(&gvar->video.page[0], 0, 0, gvar->video.page[0].width, gvar->video.page[0].height, 8);\r
                        }\r
                        sprintf(global_temp_status_text, "block #%04u", qq); MMSMPRINTMEMINFO\r
 //                     sprintf(global_temp_status_text, "%Fp", scaninfo[qq].scan->useptr); MMSMPRINTMEMINFO\r
                        sprintf(global_temp_status_text, "%04x", (unsigned)scaninfo[qq].scan->useptr); MMSMPRINTMEMINFO\r
-                       sprintf(global_temp_status_text, "size: %05u", (unsigned)scan->length); MMSMPRINTMEMINFO\r
-                       sprintf(global_temp_status_text, "free: %05u", (unsigned)(scaninfo[qq].scan->next->start-scaninfo[qq].scan->start)); MMSMPRINTMEMINFO\r
-                       end = scaninfo[qq].scan->length-1;\r
-                       y = ypos;//scaninfo[qq].scan->start/width;\r
-                       x = xpos;//scaninfo[qq].scan->start%width;\r
-                       VW_Hlin(x,x+end,y,ccolor,gvar);\r
-                       VL_Plot(x,y,5,gvar);\r
+                       sprintf(global_temp_status_text, "size: %05u", (unsigned)scaninfo[qq].scan->length); MMSMPRINTMEMINFO\r
                        if (scaninfo[qq].scan->next && scaninfo[qq].scan->next->start > end+1)\r
-                               VW_Hlin(x+end+1,x+(scaninfo[qq].scan->next->start-scan->start),y,3,gvar);       // black = free//now green\r
+                       {\r
+                               sprintf(global_temp_status_text, "free: %05u", (unsigned)(scaninfo[qq].scan->next->start-scaninfo[qq].scan->start)); MMSMPRINTMEMINFO\r
+                       }\r
+                       if(gvar->video.VL_Started)\r
+                       {\r
+                               y = ypos;//scaninfo[qq].scan->start/width;\r
+                               x = xpos;//scaninfo[qq].scan->start%width;\r
+                               VW_Hlin(x,x+end,y,ccolor,gvar);\r
+                               VL_Plot(x,y,5,gvar);\r
+                       }\r
+                       else\r
+                       {\r
+                               printf("%s", scratch1);\r
+                               printf("%s", AAGREY); printf("_");\r
+                               for(w=(scaninfo[qq].scan->start)/80;w<=end/80;w++)\r
+                               {\r
+                                       //strcat(scratch1, "+");\r
+                                       printf("+");\r
+                               }\r
+                       }\r
 \r
-                       //if (scan->next && scan->next->start > end+1) free\r
-                       xpos = 16;\r
-                       ypos = 16;//(gvar->video.page[0].sh-(32));//8*4\r
+\r
+                               if (scaninfo[qq].scan->next && scaninfo[qq].scan->next->start > end+1) if(!gvar->video.VL_Started)\r
+                               {\r
+                                       //strcat(scratch1, AARESET);\r
+                                       printf("%s", AARESET);\r
+                                       //strcat(scratch1,AAGREEN);\r
+                                       printf("%s", AAGREEN);\r
+                                       for(w=(end+1)/80;w<=((scaninfo[qq].scan->next->start-scaninfo[qq].scan->start)/80);w++)\r
+                                       {\r
+                                               //strcat(scratch1,"0");\r
+                                               printf("0");\r
+                                       }\r
+                               }else VW_Hlin(x+end+1,x+(scaninfo[qq].scan->next->start-scaninfo[qq].scan->start),y,3,gvar);    // black = free//now green\r
+\r
+\r
+                       if(gvar->video.VL_Started)\r
+                       {\r
+                               //if (scan->next && scan->next->start > end+1) free\r
+                               xpos = 16;\r
+                               ypos = 16;//(gvar->video.page[0].sh-(32));//8*4\r
+                       }\r
+                       else\r
+                       {\r
+                               //printf("%s\n", scratch1);\r
+                               printf("%s", AARESET);\r
+                               printf("\n");\r
+                       }\r
                        while (!(scancode = gvar->in.inst->LastScan)){}\r
 \r
                        IN_ClearKey(scancode);\r
@@ -1495,7 +1540,7 @@ void MM_ShowMemory (global_game_variables_t *gvar)
        }\r
 #endif\r
 \r
-       IN_Ack(gvar);\r
+       if(gvar->video.VL_Started) IN_Ack(gvar);\r
 \r
        gvar->video.BOFS = (byte __far *)temp;\r
 }\r