From: sparky4 <sparky4@cock.li>
Date: Wed, 17 May 2017 18:53:16 +0000 (-0500)
Subject: 16_ca needs huge amounts of work and I should remember what needs to be done soon... 
X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=a91efe059497d5861aa214c0f5f523ebb9f21e29

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_tdef.h b/src/lib/16_tdef.h
index c2ab97c1..88ab4cde 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -771,6 +771,7 @@ typedef struct	//TODO: USE THIS!!!!
 
 	sd_t		sd;
 	//TODO: extend! and learn from keen/wolf/catacomb's code wwww
+	memptr	spribuff;	//temp
 } ca_t;
 
 //==========================================================================
diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
index fa1d96de..e2fb8626 100755
--- a/src/lib/16_vrs.c
+++ b/src/lib/16_vrs.c
@@ -39,15 +39,18 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
 	switch(rlsw)
 	{
 		case 1:
-			CA_ReadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);
+			CA_ReadFile(filename, &gvar->ca.spribuff, gvar);
+//TODO ++++			CA_ReadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);
 		break;
 		case 0:
-			CA_LoadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);
+			CA_LoadFile(filename, &gvar->ca.spribuff, gvar);
+//TODO ++++			CA_LoadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);
 		break;
 	}
 
 	// Insert sanity cheks later
-	enti->spri.spritesheet.buffer = enti->spri.spritesheet.spribuff;	//TODO: merge these 2 vars into 1
+	enti->spri.spritesheet.buffer = gvar->ca.spribuff;
+//TODO ++++	enti->spri.spritesheet.buffer = enti->spri.spritesheet.spribuff;	//TODO: merge these 2 vars into 1
 	enti->spri.spritesheet.data_size = sizeof(enti->spri.spritesheet.buffer) - sizeof(struct vrl1_vgax_header);
 	num_of_vrl = 0;
 	vrl_id_iter = (uint16_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);
diff --git a/src/util/shbat/awoo.sh b/src/util/shbat/awoo.sh
index dcd8250c..7f561cc3 100755
--- a/src/util/shbat/awoo.sh
+++ b/src/util/shbat/awoo.sh
@@ -6,15 +6,14 @@
 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