]> 4ch.mooo.com Git - 16.git/blobdiff - src/lib/16_mm.c
updated the copyleft wwww i am not deAD! i just been 2 busy last 6 monthes
[16.git] / src / lib / 16_mm.c
index c207e0243ead8c7048dd47a5b6d9479e1b29fd99..d587df206dc3f31fb18e8482fea485dafeb446a1 100755 (executable)
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -1263,10 +1263,9 @@ void MM_SortMem (global_game_variables_t *gvar)
 \r
 \r
        SD_StopSound();*/\r
-#ifdef __WATCOMC__\r
+\r
        oldborder = gvar->video.bordercolor;\r
        gvar->video.bordercolor = VL_modexPalOverscan(gvar->video.palette, 4);\r
-#endif\r
 \r
        if (beforesort)\r
                beforesort();\r
@@ -1344,10 +1343,10 @@ void MM_SortMem (global_game_variables_t *gvar)
 extern char global_temp_status_text[512];\r
 extern char global_temp_status_text2[512];\r
 #endif\r
-#ifdef __WATCOMC__\r
+//#ifdef __WATCOMC__\r
 //#define MMSMPANVID\r
 #define MMSMSCANINFO\r
-#endif\r
+//#endif\r
 \r
 /*\r
 =====================\r
@@ -1361,7 +1360,7 @@ extern char global_temp_status_text2[512];
 void MM_ShowMemory (global_game_variables_t *gvar)\r
 {\r
        mmblocktype far *scan;\r
-       unsigned color,temp,x,y         ,q,w,width,sw;\r
+       unsigned color,temp,x,y         ,q,w/*,width*/,sw;\r
        sdword  end,owner;\r
        byte            scratch[160],scratch0[4096],str[16];\r
 #ifdef MMSMSCANINFO\r
@@ -1386,7 +1385,8 @@ reset:
 \r
        end = -1; w = 0; q = 0;\r
 \r
-       width = gvar->video.page[0].width; sw = gvar->video.page[0].sw;\r
+       //width = gvar->video.page[0].width;\r
+       sw = gvar->video.page[0].sw;\r
 \r
        CA_OpenDebug (gvar);\r
        while (scan)\r
@@ -1500,9 +1500,8 @@ reset:
 //0000fprintf(stdout, "[%u]\n", q);\r
 \r
                scan = scan->next;\r
-//#ifdef MMSMSCANINFO\r
                q++;\r
-//#endif\r
+\r
 //0000if(gvar->video.VL_Started && color!=6) IN_Ack(gvar);\r
        }\r
 \r
@@ -1689,9 +1688,11 @@ reset:
                        case sc_Space:\r
                                oldq = q;\r
                                restarted = true;\r
-                               modexClearRegion(&gvar->video.page[0], gvar->video.page[0].dx, gvar->video.page[0].dy, gvar->video.page[0].sw, gvar->video.page[0].sh, 8);\r
+#ifdef __WATCOMC__\r
+                               if(gvar->video.VL_Started) modexClearRegion(&gvar->video.page[0], gvar->video.page[0].dx, gvar->video.page[0].dy, gvar->video.page[0].sw, gvar->video.page[0].sh, 8);\r
+#endif\r
                                goto reset;\r
-                       break;\r
+\r
                        case sc_Escape:\r
                                done = true;\r
                        break;\r