Revert "XCROLL IS MYSTERIOUSLY NOT WORKING"

This reverts commit 8db9019df22bf792ea02096dec8c3d862fa00155.

	modified:   src/lib/16_mm.c
	modified:   src/lib/16_tdef.h
	modified:   src/lib/doslib
	modified:   src/xcroll.c

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index bb392aab60439095c35843eb7f14d38dfb461528..5061b4d50fc8eab9d2850d4fa7b52097d929bd92 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -826,7 +826,7 @@ void MM_Startup (global_game_variables_t *gvar)
 \r
        //has to be 16\r
        if(sizeof(mmblocktype)!=16)\r
-               Quit (gvar, "mmblocktype size is not 16");\r
+               return;\r
 \r
        gvar->mm.mmstarted = true;\r
        gvar->mm.bombonerror = true;\r

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index f4b9d094553fde03019ab16c451c78c848285be5..88ab4cdeb4c10985d37c5af1609bcffc9799e211 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -501,8 +501,9 @@ typedef struct
 \r
 typedef struct mmblockstruct\r
 {\r
-       //word  start,length,           word    blob;   //for data larger than 64k\r
+       //word  start,length;\r
        word    start;  dword length;\r
+       //word  blob;   //for data larger than 64k\r
        unsigned        attributes;\r
        memptr          *useptr;        // pointer to the segment start\r
        struct mmblockstruct far *next;\r

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

diff --git a/src/xcroll.c b/src/xcroll.c
index b9e928430425082927d17516a70e6dfb1f73bf10..52d9b5b9143022c72bb2d9ee00ebb2fef13bf296 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -69,9 +69,6 @@ void main(int argc, char *argv[])
 \r
        ggvv=&gvar;\r
 \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
                if(argv[2]) strcpy(bakapeep, argv[2]); }\r
@@ -94,9 +91,10 @@ void main(int argc, char *argv[])
        //initMap(&map);\r
 #endif\r
        // data\r
-       printf("loading vrs     ");\r
-       VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar);      printf("ok\n");\r
-       IN_StartAck (&gvar);    while (!IN_CheckAck (&gvar)){}\r
+       VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar);\r
+\r
+       // input!\r
+       IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);\r
 \r
        // save the palette\r
 #ifdef FADE\r