xcroll.exe needs through testing on real hardware\!\!\!\! ass\! 16_ca needs huge...

diff --git a/makefile b/makefile
index 19d47e5278574925444524be9e68776aa1478497..bb06aa4230bc91c6fb22d59ac9f8a23be1e91856 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -119,7 +119,7 @@ UPXQ=-qqq
 #
 # compile flags
 #
-S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k40960#32768#24576
+S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#24576
 Z_FLAGS=-zk0 -zc -zm#### -zp4 -ei
 O_FLAGS=-opnr -oe=24 -oil+ -outback -ohm
 T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1 -fo=.$(OBJ)## -e=65536

diff --git a/src/lib/16_t.h b/src/lib/16_t.h
index db1871f7f5d05d14f860eab9b45e45d7636c7abc..ff73865751b57b0a984f94756819344b50a5bd76 100755 (executable)
--- a/src/lib/16_t.h
+++ b/src/lib/16_t.h
@@ -49,16 +49,19 @@ 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
+\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
-       #endif\r
-       #ifdef __BORLANDC__\r
+// #define __SEGA __segment\r
+#endif\r
+#ifdef __BORLANDC__\r
 #define _memavl()               coreleft()\r
-       #endif\r
+// #define __SEGA _seg\r
+#endif\r
 \r
 typedef void _seg * memptr;\r
 \r

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

diff --git a/src/maptest.c b/src/maptest.c
index fd966ffffe498af5725da55c342643606b56440e..7b53667c7d755a61073088bada70837bf6881e09 100755 (executable)
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -23,7 +23,7 @@
 #include <malloc.h>\r
 \r
 #define DUMP\r
-#define DUMP_MAP\r
+//#define DUMP_MAP\r
 \r
 void\r
 main(int argc, char *argv[])\r
@@ -42,13 +42,15 @@ main(int argc, char *argv[])
 \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
-       fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.MAPSEGPTR)));\r
+       fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.mapsegs)));\r
+       //getch();\r
 \r
        CA_loadmap("data/test.map", &map, &gvar);\r
 #ifdef DUMP\r
@@ -56,6 +58,7 @@ main(int argc, char *argv[])
        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
@@ -72,7 +75,7 @@ main(int argc, char *argv[])
                getch();\r
        }\r
 #else\r
-       fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.MAPSEGPTR));\r
+       //fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.mapsegs));\r
 #endif\r
        /*fprintf(stdout, "&main()=%Fp\n", *argv[0]);\r
        fprintf(stdout, "&map==%Fp\n", &map);\r
@@ -82,7 +85,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
-       MM_FreePtr(MEMPTRCONV (gvar.ca.MAPSEGPTR), &gvar);\r
+       MM_FreePtr((memptr *)&(gvar.ca.mapsegs), &gvar);\r
        PM_Shutdown(&gvar);\r
        CA_Shutdown(&gvar);\r
        MM_Shutdown(&gvar);\r

diff --git a/src/xcroll.c b/src/xcroll.c
index 29ef17f4b7537423ab268f0c4bfab65e56d6b2f5..a8c8e2eaaaf83ff9d670bca4f360a7b8866c2b80 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -24,11 +24,9 @@
 #include "src/lib/16_timer.h"\r
 #include "src/lib/16_dbg.h"\r
 \r
-//#define FADE\r
+#define FADE\r
 //#define NOMAPLOAD\r
 \r
-//#define VERBOSESCROLL\r
-\r
 static map_t map;\r
 float t;\r
 \r
@@ -65,8 +63,6 @@ void main(int argc, char *argv[])
        Startup16(&gvar);\r
 \r
        ggvv=&gvar;\r
-       // input!\r
-       IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);\r
 \r
        if (argc >= 2) {\r
                if(argv[1]){ strcpy(bakapee, argv[1]);\r
@@ -78,40 +74,22 @@ void main(int argc, char *argv[])
        //----gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));\r
 \r
        // create the map\r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "testing map load~      ");\r
-               #endif\r
+//     fprintf(stderr, "testing map load~      ");\r
        CA_loadmap("data/test.map", &map, &gvar);\r
 #ifndef NOMAPLOAD\r
        chkmap(&map, 0);\r
 //     initMap(&map);\r
+//     printf("chkmap ok       ");\r
+//     fprintf(stderr, "yay map loaded~~\n");\r
 #else\r
        chkmap(&map, 1);\r
        //initMap(&map);\r
 #endif\r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "chkmap ok      ");\r
-       fprintf(stderr, "yay map loaded~~\n");\r
-               #endif\r
-\r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "press a key wwww\n");\r
-       IN_StartAck (&gvar);    while (!IN_CheckAck (&gvar)){}\r
-               #endif\r
-\r
        // data\r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "VRS_LoadVRS    ");\r
-               #endif\r
        VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar);\r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "ok~\n");\r
-               #endif\r
 \r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "press a key wwww\n");\r
-       IN_StartAck (&gvar);    while (!IN_CheckAck (&gvar)){}\r
-               #endif\r
+       // input!\r
+       IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);\r
 \r
        // save the palette\r
 #ifdef FADE\r
@@ -131,9 +109,6 @@ void main(int argc, char *argv[])
        //printf("1:    %d\n", paloffset);\r
        map.tiles->data->offset=(paloffset/3);\r
        modexPalUpdate(map.tiles->data, &paloffset, 0, 0);*/\r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "VL_LoadPalFile ");\r
-               #endif\r
        VL_LoadPalFile(bakapeep, &gvar.video.palette, &gvar);\r
        //VL_LoadPalFile("data/default.pal", &gvar.video.palette);\r
 \r
@@ -142,9 +117,6 @@ void main(int argc, char *argv[])
        modexSavePalFile("data/g.pal", &gvar.video.palette);\r
        modexPalBlack();        //so player will not see loadings~\r
 #endif\r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "ok\n");\r
-               #endif\r
 \r
        // setup camera and screen~\r
        modexHiganbanaPageSetup(&gvar);\r