From: sparky4 <sparky4@cock.li>
Date: Wed, 17 May 2017 14:21:41 +0000 (-0500)
Subject: [xcroll.exe needs testing on real hardware] it is working but not flexible 16_ca... 
X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=11757203baaa7f57f795025a3326e97a4a5f2b70

[xcroll.exe needs testing on real hardware] it is working but not flexible 16_ca needs huge amounts of work and I should remember what needs to be done soon[going to port rest of code to borland c some time so we can use the core components of id engine here ][going to add 16_us.c eventually but the debug system and CA_ PM_ and MM_ usage is priority now]older zcroll renamed to xcroll][zcroll is now the pre menu game loop system with PROPER data usage with CAMMPM] added 1st scroll back [i work on CA] palette debug show values added wwww and i need to know how to see vrs/vrl imaage data palette index numbers [i am trying to find out how the hell you get the index number values of VRL/VRS] boom has been fixed ^^[CA_CacheMap added seems to be used in start a new game] what is mapsegs?
---

diff --git a/src/lib/16_t.h b/src/lib/16_t.h
index ff738657..db1871f7 100755
--- 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;
 
 memptr should be replaced by memseg in code.
-
 on usage where you need pointer convert memseg type (segment) to far pointer by
 MK_FP(segment value, 0)*/
-#ifdef __WATCOMC__
+	#ifdef __WATCOMC__
 //typedef void __based( void ) * memptr;	////old //----typedef void __based(__self) * memptr;
 //typedef unsigned short _seg; // it will contains segment value (as Borland _seg)
 #define _seg __based( void )
-// #define __SEGA __segment
-#endif
-#ifdef __BORLANDC__
+	#endif
+	#ifdef __BORLANDC__
 #define _memavl()               coreleft()
-// #define __SEGA _seg
-#endif
+	#endif
 
 typedef void _seg * memptr;
 
diff --git a/src/lib/doslib b/src/lib/doslib
index eac2278e..cac7222a 160000
--- 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 7b53667c..33c5dcc7 100755
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -42,15 +42,13 @@ main(int argc, char *argv[])
 
 	MM_Startup(&gvar);
 	PM_Startup(&gvar);
-	//printf("pmstarted ok\n");
 	PM_CheckMainMem(&gvar);
 	PM_UnlockMainMem(&gvar);
 	CA_Startup(&gvar);
 
 	fprintf(stderr, fmt, _memavl());
 	fprintf(stderr, fmt0, _memmax());
-	fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.mapsegs)));
-	//getch();
+	fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.MAPSEGPTR)));
 
 	CA_loadmap("data/test.map", &map, &gvar);
 #ifdef DUMP
@@ -58,7 +56,6 @@ main(int argc, char *argv[])
 	fprintf(stdout, "map.height=	%d\n", map.height);
 	getch();
 #ifdef DUMP_MAP
-	//if(map.width*map.height != 1200)
 	for(k=0;k<MAPPLANES;k++)
 	{
 		printf("maplayer: %u\n[\n", k);
@@ -75,7 +72,7 @@ main(int argc, char *argv[])
 		getch();
 	}
 #else
-	//fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.mapsegs));
+	fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.MAPSEGPTR));
 #endif
 	/*fprintf(stdout, "&main()=%Fp\n", *argv[0]);
 	fprintf(stdout, "&map==%Fp\n", &map);
@@ -85,7 +82,7 @@ main(int argc, char *argv[])
 	fprintf(stdout, "&map.data==%Fp\n", map.data);*/
 #endif
 	//fprintf(stderr, "here comes dat boi!\n"); getch(); fprintf(stderr, "%s", datboi);
-	MM_FreePtr((memptr *)&(gvar.ca.mapsegs), &gvar);
+	MM_FreePtr(MEMPTRCONV (gvar.ca.MAPSEGPTR), &gvar);
 	PM_Shutdown(&gvar);
 	CA_Shutdown(&gvar);
 	MM_Shutdown(&gvar);
diff --git a/src/util/shbat/awoo.sh b/src/util/shbat/awoo.sh
index 7f561cc3..dcd8250c 100755
--- 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
-if [ -z "$*" ]; then
-		pee="wwww"
-	else
-		pee="$*"
-fi
+#if [ -z "$*" ]; then
+#		pee="wwww"
+#	else
+#		pee="$*"
+#fi
 ##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