before showmem workings

diff --git a/makefile b/makefile
index 6b4a2fea51b0a27aa4d547c4bffc7fa1de3ad86f..06c0f45dd42b7384807e7fd985681e22750f4ce9 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -227,7 +227,8 @@ UTILEXEC = &
        palettel.exe &
        palllist.exe &
        palbomb.exe &
-       palettec.exe
+       palettec.exe &
+       ps.exe
 !ifdef __LINUX__
 SPRIUTILEXEC = &
        pcx2vrl &

diff --git a/ps.exe b/ps.exe
deleted file mode 100755 (executable)
index 832bb5d..0000000
Binary files a/ps.exe and /dev/null differ

diff --git a/src/lib/16_head.c b/src/lib/16_head.c
index 1af195348864d51b8a1d690f5677cef1d102c7c8..b371d10907ca3c7d8f2ec4cc20fb71a0489d4d3f 100755 (executable)
--- a/src/lib/16_head.c
+++ b/src/lib/16_head.c
@@ -198,3 +198,15 @@ void print_mem(void const *vp, size_t n)
        putchar('\n');\r
        printf("\nstruct size is %zu bytes\n", n);\r
 };\r
+\r
+//from: https://groups.google.com/forum/#!topic/comp.lang.asm.x86/QtuVXl43nDo\r
+void hres (void)\r
+{\r
+       __asm {\r
+               mov     ax,3\r
+               int     10h\r
+               mov     ax,1112h\r
+               xor     bx,bx\r
+               int     10h\r
+       }\r
+}\r

diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index a92a21b5d38e2767b8dc885d1193876a77dc246e..8c5d5381699677454c15d591c9aa703c2d271600 100755 (executable)
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -196,6 +196,7 @@ void printmeminfoline(byte *strc, const byte *pee, size_t h_total, size_t h_used
 int US_CheckParm(char *parm,char **strings);\r
 byte dirchar(byte in);\r
 void print_mem(void const *vp, size_t n);\r
+void hres (void);\r
 \r
 #define PRINT_OPAQUE_STRUCT(p)  print_mem((p), sizeof(*(p)))\r
 \r

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index a5903b0cfd16f833414408bbeae43e9ada938411..f3af11cca75109991407e94d48522573ca9c3ff9 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1413,12 +1413,8 @@ reset:
                {\r
                        printf("\nend==%d\n\n", end);\r
                        strcat(scratch, "MM_ShowMemory: Memory block order currupted!\n");\r
-                       strcat(scratch, "End's Size: ");\r
-                       ultoa (end,str,10);\r
-                       strcat (scratch,str);\r
-                       strcat(scratch, "\nscan->start's Size: ");\r
-                       ultoa (scan->start,str,10);\r
-                       strcat (scratch,str);\r
+                       strcat(scratch, "End's Size: ");        ultoa (end,str,10);     strcat (scratch,str);\r
+                       strcat(scratch, "\nscan->start's Size: ");      ultoa (scan->start,str,10);     strcat (scratch,str);\r
                        write(gvar->handle.debughandle,scratch,strlen(scratch));\r
                        Quit (gvar, "MM_ShowMemory: Memory block order currupted!");\r
                }\r

diff --git a/src/lib/doslib b/src/lib/doslib
index 4a5b0a9ac65c61b586956cb4ba103c12b3679ad4..cff67cda35b51eb48c9fc4481034bda2d7ed7786 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 4a5b0a9ac65c61b586956cb4ba103c12b3679ad4
+Subproject commit cff67cda35b51eb48c9fc4481034bda2d7ed7786

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 3c7bc5597e261a20cd4a955f4c71e86792d5c449..f7db2a7a016b04ef08c9a74ceb50e52d69f7fe37 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -42,7 +42,8 @@
 #define SPRITE\r
 //#define TILERENDER\r
 \r
-//0000#define SHOWFPS\r
+//0000\r
+#define SHOWFPS\r
 //#define OLDWALKSHOWPAGESTUFF\r
 \r
 \r

diff --git a/src/ps.c b/src/ps.c
index d8e906ab2522c586725b0446d8cefd9da3d25326..645006fcd3687b3e18db68252af25d4b7f0a6911 100755 (executable)
--- a/src/ps.c
+++ b/src/ps.c
@@ -4,6 +4,7 @@
 void main()\r
 {\r
        static global_game_variables_t gvar;\r
+       hres();\r
        printf("video:\n");\r
        PRINT_OPAQUE_STRUCT(&gvar.video);\r
        printf("ca:\n");\r