[xcroll.exe needs testing on real hardware] it is working but not flexible 16_ca...

diff --git a/src/lib/16_t.h b/src/lib/16_t.h
index ff73865751b57b0a984f94756819344b50a5bd76..db1871f7f5d05d14f860eab9b45e45d7636c7abc 100755 (executable)
--- a/src/lib/16_t.h
+++ b/src/lib/16_t.h
@@ -49,19 +49,16 @@ typedef     enum    {ichi,ni,san,yon,go,roku,shichi,hachi,kyu,ju,juichi,juni,jusan,juyo
 /*typedef unsigned memseg;\r
 \r
 memptr should be replaced by memseg in code.\r
 /*typedef unsigned memseg;\r
 \r
 memptr should be replaced by memseg in code.\r

-\r

 on usage where you need pointer convert memseg type (segment) to far pointer by\r
 MK_FP(segment value, 0)*/\r
 on usage where you need pointer convert memseg type (segment) to far pointer by\r
 MK_FP(segment value, 0)*/\r

-#ifdef __WATCOMC__\r
+       #ifdef __WATCOMC__\r

 //typedef void __based( void ) * memptr;       ////old //----typedef void __based(__self) * memptr;\r
 //typedef unsigned short _seg; // it will contains segment value (as Borland _seg)\r
 #define _seg __based( void )\r
 //typedef void __based( void ) * memptr;       ////old //----typedef void __based(__self) * memptr;\r
 //typedef unsigned short _seg; // it will contains segment value (as Borland _seg)\r
 #define _seg __based( void )\r

-// #define __SEGA __segment\r
-#endif\r
-#ifdef __BORLANDC__\r
+       #endif\r
+       #ifdef __BORLANDC__\r

 #define _memavl()               coreleft()\r
 #define _memavl()               coreleft()\r

-// #define __SEGA _seg\r
-#endif\r
+       #endif\r

 \r
 typedef void _seg * memptr;\r
 \r
 \r
 typedef void _seg * memptr;\r
 \r

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

diff --git a/src/maptest.c b/src/maptest.c
index 7b53667c7d755a61073088bada70837bf6881e09..33c5dcc7152a6e3d5e949734248388ecdd1c4908 100755 (executable)
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -42,15 +42,13 @@ main(int argc, char *argv[])
 \r
        MM_Startup(&gvar);\r
        PM_Startup(&gvar);\r
 \r
        MM_Startup(&gvar);\r
        PM_Startup(&gvar);\r

-       //printf("pmstarted ok\n");\r

        PM_CheckMainMem(&gvar);\r
        PM_UnlockMainMem(&gvar);\r
        CA_Startup(&gvar);\r
 \r
        fprintf(stderr, fmt, _memavl());\r
        fprintf(stderr, fmt0, _memmax());\r
        PM_CheckMainMem(&gvar);\r
        PM_UnlockMainMem(&gvar);\r
        CA_Startup(&gvar);\r
 \r
        fprintf(stderr, fmt, _memavl());\r
        fprintf(stderr, fmt0, _memmax());\r

-       fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.mapsegs)));\r
-       //getch();\r
+       fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.MAPSEGPTR)));\r

 \r
        CA_loadmap("data/test.map", &map, &gvar);\r
 #ifdef DUMP\r
 \r
        CA_loadmap("data/test.map", &map, &gvar);\r
 #ifdef DUMP\r


@@ -58,7 +56,6 @@ main(int argc, char *argv[])
        fprintf(stdout, "map.height=    %d\n", map.height);\r
        getch();\r
 #ifdef DUMP_MAP\r
        fprintf(stdout, "map.height=    %d\n", map.height);\r
        getch();\r
 #ifdef DUMP_MAP\r

-       //if(map.width*map.height != 1200)\r

        for(k=0;k<MAPPLANES;k++)\r
        {\r
                printf("maplayer: %u\n[\n", k);\r
        for(k=0;k<MAPPLANES;k++)\r
        {\r
                printf("maplayer: %u\n[\n", k);\r


@@ -75,7 +72,7 @@ main(int argc, char *argv[])
                getch();\r
        }\r
 #else\r
                getch();\r
        }\r
 #else\r

-       //fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.mapsegs));\r
+       fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.MAPSEGPTR));\r

 #endif\r
        /*fprintf(stdout, "&main()=%Fp\n", *argv[0]);\r
        fprintf(stdout, "&map==%Fp\n", &map);\r
 #endif\r
        /*fprintf(stdout, "&main()=%Fp\n", *argv[0]);\r
        fprintf(stdout, "&map==%Fp\n", &map);\r


@@ -85,7 +82,7 @@ main(int argc, char *argv[])
        fprintf(stdout, "&map.data==%Fp\n", map.data);*/\r
 #endif\r
        //fprintf(stderr, "here comes dat boi!\n"); getch(); fprintf(stderr, "%s", datboi);\r
        fprintf(stdout, "&map.data==%Fp\n", map.data);*/\r
 #endif\r
        //fprintf(stderr, "here comes dat boi!\n"); getch(); fprintf(stderr, "%s", datboi);\r

-       MM_FreePtr((memptr *)&(gvar.ca.mapsegs), &gvar);\r
+       MM_FreePtr(MEMPTRCONV (gvar.ca.MAPSEGPTR), &gvar);\r

        PM_Shutdown(&gvar);\r
        CA_Shutdown(&gvar);\r
        MM_Shutdown(&gvar);\r
        PM_Shutdown(&gvar);\r
        CA_Shutdown(&gvar);\r
        MM_Shutdown(&gvar);\r

diff --git a/src/util/shbat/awoo.sh b/src/util/shbat/awoo.sh
index 7f561cc3345f31d68c1deb021775338857a564de..dcd8250c366bdc1806a0f80e4cebe595bd361698 100755 (executable)
--- a/src/util/shbat/awoo.sh
+++ b/src/util/shbat/awoo.sh
@@ -6,14 +6,15 @@
 wmake -s -h www
 wmake -s -h clean
 wmake -s -h backupscript
 wmake -s -h www
 wmake -s -h clean
 wmake -s -h backupscript

-if [ -z "$*" ]; then
-               pee="wwww"
-       else
-               pee="$*"
-fi
+#if [ -z "$*" ]; then
+#              pee="wwww"
+#      else
+#              pee="$*"
+#fi

 ##echo "$pee"
 git add .
 ##echo "$pee"
 git add .

-. src/util/shbat/boop.sh "$pee"
+. src/util/shbat/boop.sh "$*"
+#"$pee"

 wmake -s -h initscript
 . ./wbuild.sh
 ##. ./mkdld.sh# slow compile ww
 wmake -s -h initscript
 . ./wbuild.sh
 ##. ./mkdld.sh# slow compile ww