XCROLL IS MYSTERIOUSLY NOT WORKING

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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 06338dbbb9ac92951fb50a8bd7af00488a58d4ae..bb392aab60439095c35843eb7f14d38dfb461528 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -789,9 +789,9 @@ void MML_ClearBlock (global_game_variables_t *gvar)
 \r
        while(scan)\r
        {\r
-               if(!(scan->attributes&LOCKBIT) && (scan->attributes&PURGEBITS))\r
+               if(!(scan->attributes&LOCKBIT) && (scan->attributes&PURGEBITS) )\r
                {\r
-                       MM_FreePtr(scan->useptr, gvar);\r
+                       MM_FreePtr (scan->useptr, gvar);\r
                        return;\r
                }\r
                scan = scan->next;\r
@@ -824,6 +824,10 @@ void MM_Startup (global_game_variables_t *gvar)
        if(gvar->mm.mmstarted)\r
                MM_Shutdown (gvar);\r
 \r
+       //has to be 16\r
+       if(sizeof(mmblocktype)!=16)\r
+               Quit (gvar, "mmblocktype size is not 16");\r
+\r
        gvar->mm.mmstarted = true;\r
        gvar->mm.bombonerror = true;\r
 //\r
@@ -1010,14 +1014,21 @@ void MM_GetPtr (memptr *baseptr,dword size, global_game_variables_t *gvar)
        gvar->mm.mmnew->attributes = BASEATTRIBUTES;\r
        //if(gvar->mm.mmnew->useptr==NULL){\r
 #ifdef __DEBUG_MM__\r
-       printf("MM_GetPtr\n");\r
        if(dbg_debugmm>0){\r
+       printf("===============================================================================\n");\r
+       printf("                MM_GetPtr\n");\r
+       printf("===============================================================================\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
+//             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("        baseptr=%04x    ", baseptr); printf("useptr=%04x\n", gvar->mm.mmnew->useptr);\r
+               //printf("      *baseptr=%04x   ", *baseptr); printf("*useptr=%04x\n", *(gvar->mm.mmnew->useptr));\r
+               printf("        &baseptr=%04u   ", &baseptr); printf("&useptr=%04u\n", &(gvar->mm.mmnew->useptr));\r
+\r
+               printf("        size is %lu\n", size);\r
        }\r
-       printf("        size is %lu\n", size);\r
 #endif\r
        //Quit (gvar, "gvar->mm.mmnew->useptr==NULL"); }\r
 \r
@@ -1248,8 +1259,10 @@ void MM_SortMem (global_game_variables_t *gvar)
 \r
 \r
        SD_StopSound();*/\r
+#ifdef __WATCOMC__\r
        oldborder = gvar->video.bordercolor;\r
        gvar->video.bordercolor = VL_modexPalOverscan(gvar->video.palette, 4);\r
+#endif\r
 \r
        if (beforesort)\r
                beforesort();\r
@@ -1498,6 +1511,17 @@ void MM_ShowMemory (global_game_variables_t *gvar)
        }\r
 #endif\r
 #ifdef MMSMSCANINFO\r
+       MM_ShowMemoryDetail (x, y, w, q, end, &scaninfo, gvar);\r
+#endif\r
+\r
+\r
+       if(gvar->video.VL_Started) IN_Ack(gvar);\r
+\r
+       gvar->video.BOFS = (byte __far *)temp;\r
+}\r
+\r
+#ifdef MMSMSCANINFO\r
+void MM_ShowMemoryDetail (unsigned x, unsigned y, unsigned w, unsigned q, sdword end, mmshowmemoryinfo_t *scaninfo, global_game_variables_t *gvar)\r
        {\r
                byte scratch1[4];\r
                unsigned                maxq = q;\r
@@ -1533,7 +1557,7 @@ void MM_ShowMemory (global_game_variables_t *gvar)
        struct mmblockstruct far *next;\r
 } 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
+#define MMSMPRINTMEMINFO modexprint(&(gvar->video.page[0]), xpos, ypos, 1, 1, ccolor, 8, gvar->video.VL_Started, global_temp_status_text); ypos+=8;\r
                        if(gvar->video.VL_Started)\r
                        {\r
                                VL_ShowPage(&gvar->video.page[0], 1, 0);\r
@@ -1541,7 +1565,8 @@ void MM_ShowMemory (global_game_variables_t *gvar)
                        }else clrscr();\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, "start:  %04x", (unsigned)scaninfo[qq].scan->start); MMSMPRINTMEMINFO\r
+                       sprintf(global_temp_status_text, "useptr: %04x", (unsigned)scaninfo[qq].scan->useptr); MMSMPRINTMEMINFO\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
                        {\r
@@ -1583,8 +1608,8 @@ void MM_ShowMemory (global_game_variables_t *gvar)
                        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
+                               xpos = gvar->video.page[0].dx;\r
+                               ypos = gvar->video.page[0].dy;//(gvar->video.page[0].sh-(32));//8*4\r
                        }\r
                        else\r
                        {\r
@@ -1605,6 +1630,14 @@ void MM_ShowMemory (global_game_variables_t *gvar)
                                        if(qq<maxq) qq++;\r
                                        else qq = 0;\r
                                break;\r
+/*                             case sc_UpArrow:\r
+                                       if(qq>0) qq-=100;\r
+                                       else    qq = maxq;\r
+                               break;\r
+                               case sc_DownArrow:\r
+                                       if(qq<maxq) qq+=100;\r
+                                       else qq = 0;\r
+                               break;*/\r
                                case sc_Escape:\r
                                        done = true;\r
                                break;\r
@@ -1613,11 +1646,6 @@ void MM_ShowMemory (global_game_variables_t *gvar)
        }\r
 #endif\r
 \r
-       if(gvar->video.VL_Started) IN_Ack(gvar);\r
-\r
-       gvar->video.BOFS = (byte __far *)temp;\r
-}\r
-\r
 //==========================================================================\r
 \r
 /*\r