From dc02e71c9e6a133f3deba4c3315c2062070a10bf Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Tue, 23 May 2017 20:00:22 -0500
Subject: [PATCH] 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
---
 src/lib/16_mm.c   |  2 +-
 src/lib/16_tdef.h |  3 ++-
 src/lib/doslib    |  2 +-
 src/xcroll.c      | 10 ++++------
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index bb392aab..5061b4d5 100755
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -826,7 +826,7 @@ void MM_Startup (global_game_variables_t *gvar)
 
 	//has to be 16
 	if(sizeof(mmblocktype)!=16)
-		Quit (gvar, "mmblocktype size is not 16");
+		return;
 
 	gvar->mm.mmstarted = true;
 	gvar->mm.bombonerror = true;
diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index f4b9d094..88ab4cde 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -501,8 +501,9 @@ typedef struct
 
 typedef struct mmblockstruct
 {
-	//word	start,length,		word	blob;	//for data larger than 64k
+	//word	start,length;
 	word	start;	dword length;
+	//word	blob;	//for data larger than 64k
 	unsigned	attributes;
 	memptr		*useptr;	// pointer to the segment start
 	struct mmblockstruct far *next;
diff --git a/src/lib/doslib b/src/lib/doslib
index a9daa1c7..03c79f45 160000
--- 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 b9e92843..52d9b5b9 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -69,9 +69,6 @@ void main(int argc, char *argv[])
 
 	ggvv=&gvar;
 
-	// input!
-	IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);
-
 	if (argc >= 2) {
 		if(argv[1]){ strcpy(bakapee, argv[1]);
 		if(argv[2]) strcpy(bakapeep, argv[2]); }
@@ -94,9 +91,10 @@ void main(int argc, char *argv[])
 	//initMap(&map);
 #endif
 	// data
-	printf("loading vrs	");
-	VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar);	printf("ok\n");
-	IN_StartAck (&gvar);	while (!IN_CheckAck (&gvar)){}
+	VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar);
+
+	// input!
+	IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);
 
 	// save the palette
 #ifdef FADE
-- 
2.39.2