OSDN Git Service

p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...
authorsparky4 <sparky4@cock.li>
Sat, 15 Apr 2017 14:06:23 +0000 (09:06 -0500)
committersparky4 <sparky4@cock.li>
Sat, 15 Apr 2017 14:06:23 +0000 (09:06 -0500)
src/exmmtest.c
src/lib/16_mm.c
src/lib/16_vl.c
src/lib/scroll16.h

index 98708a8..010bb6e 100755 (executable)
@@ -262,7 +262,7 @@ PRINTBB; KEYP
 \r
 #ifdef __WATCOMC__\r
 #ifndef NOVID\r
-       VGAmodeX(1, 0, &gvar);\r
+       VGAmodeX(8, 0, &gvar);\r
 //     modexPalUpdate0(&gvar.video.palette);\r
 //     ShapeTest_(&gvar);\r
 \r
@@ -375,6 +375,8 @@ PRINTBB; KEYP
 #endif\r
        printf("\n");\r
 #endif\r
+//     printf("curr_mode=%u\n", gvar.video.curr_mode);\r
+//     VL_PrintmodexmemInfo(&gvar.video);\r
        //printf("old_mode=%u   VL_Started=%u", gvar.video.old_mode, gvar.video.VL_Started);\r
        //printf("based core left:                      %lu\n", (dword)_basedcoreleft());\r
        //printf("huge core left:                       %lu\n", (dword)_hugecoreleft());\r
index 7bd320b..3e2077e 100755 (executable)
@@ -1282,15 +1282,15 @@ void MM_ShowMemory(global_game_variables_t *gvar)
                strcpy(scratch, AARESET);
                if(scan->attributes & PURGEBITS)
                {
-                       color = 5;              // dark purple = purgable
+                       color = 6;              // dark purple = purgable
                        strcpy(scratch0, AAMAGENTA);            // dark purple = purgable
                }else{
-                       color = 9;              // medium blue = non purgable
+                       color = 2;              // medium blue = non purgable
                        strcpy(scratch0, AABLUE);               // medium blue = non purgable
                }
                if(scan->attributes & LOCKBIT)
                {
-                       color = 12;             // red = locked
+                       color = 1             // red = locked
                        strcpy(scratch0, AARED);                // red = locked
                }
                if(scan->start<=end)
@@ -1329,7 +1329,7 @@ void MM_ShowMemory(global_game_variables_t *gvar)
                if (scan->next && scan->next->start >= end+1)
 #endif
                {
-                       VW_Hlin(x+end+1,x+(scan->next->start-scan->start),y,0,gvar);    // black = free
+                       VW_Hlin(x+end+1,x+(scan->next->start-scan->start),y,3,gvar);    // black = free//now green
                        strcat(scratch0, AARESET);
 //++==++==optional                     strcat(scratch0, "\n");
                        strcat(scratch0,AAGREEN);
index db066c7..12d8c4b 100755 (executable)
@@ -282,7 +282,7 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
        switch(vq)\r
        {\r
                case 1:\r
-//             case 8: //320x240 no buffer\r
+               case 8: //320x240 no buffer\r
                        //CRTParmCount = sizeof(ModeX_320x240regs) / sizeof(ModeX_320x240regs[0]);\r
                        /*for(i=0; i<CRTParmCount; i++) {\r
                                outpw(CRTC_INDEX, ModeX_320x240regs[i]);\r
@@ -1374,17 +1374,24 @@ void VL_PrintmodexmemInfo(video_t *v)
 //     printf("========================================\n");\r
        printf("  Virtual Screen: %dx", v->page[0].width);      printf("%d      ", v->page[0].height);  printf("Tile: %dx", v->page[0].ti.tilesw);              printf("%d", v->page[0].ti.tilesh);     printf("=((Virtual Screen)/16)\n");\r
        printf("          Screen: %dx", v->page[0].sw);         printf("%d      ", v->page[0].sh);              printf("Tile: %dx", v->page[0].ti.tw);                  printf("%d", v->page[0].ti.th);         printf("=((Screen)/16)\n");\r
+       printf("  stride: %u ", vga_state.vga_stride);\r
+       printf("draw_stride: %u ", vga_state.vga_draw_stride);\r
+       printf("draw_stride_limit: %u\n", vga_state.vga_draw_stride_limit);\r
 \r
-       printf("  Free Video Memory: %u\n", v->vmem_remain);\r
-       printf("  page");\r
-       for(i=0; i<v->num_of_pages;i++)\r
+       if(v->vmem_remain)\r
+               printf("  Free Video Memory: %u\n", v->vmem_remain);\r
+       if(v->num_of_pages)\r
        {\r
-               printf("        [%u]=", i);\r
-               printf("(%Fp)", (v->page[i].data));\r
-               printf(" size=%u        ", v->page[i].pagesize);\r
-               printf("w=%-3lu  h=%-3lu ", (unsigned long)v->page[i].width, (unsigned long)v->page[i].height);\r
-               printf("sw=%-3lu  sh=%-3lu ", (unsigned long)v->page[i].sw, (unsigned long)v->page[i].sh);\r
-               printf("pi=%u", v->page[i].pi);\r
-               printf("\n");\r
+       printf("  page");\r
+               for(i=0; i<v->num_of_pages;i++)\r
+               {\r
+                       printf("        [%u]=", i);\r
+                       printf("(%Fp)", (v->page[i].data));\r
+                       printf(" size=%u        ", v->page[i].pagesize);\r
+                       printf("w=%-3lu  h=%-3lu ", (unsigned long)v->page[i].width, (unsigned long)v->page[i].height);\r
+                       printf("sw=%-3lu  sh=%-3lu ", (unsigned long)v->page[i].sw, (unsigned long)v->page[i].sh);\r
+                       printf("pi=%u", v->page[i].pi);\r
+                       printf("\n");\r
+               }\r
        }\r
 }\r
index 546fbe2..2eb1b83 100755 (executable)
@@ -91,9 +91,9 @@ printf("\n\n");\
        printf("gvar.video:\n");\\r
        printf(" r=%u ", gvar.video.dorender);\\r
        printf("bgps=%u ", gvar.video.vga_state.bgps);\\r
-       printf("dbg_delayanimation=%u ", dbg_delayanimation);\\r
 printf("\n\n");\r
 \r
+//     printf("dbg_delayanimation=%u ", dbg_delayanimation);\r
 /*\r
        if(IN_KeyDown(sc_F11)){ pagedelayrendermap=!pagedelayrendermap;         IN_UserInput(1, &gvar); }\r
        if(IN_KeyDown(sc_F10)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap;               IN_UserInput(1, &gvar); }\r