16_ca needs huge amounts of work and I should remember what needs to be done soon...

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index c2ab97c1c905094065cfae2a13a2c5b54c93fe19..88ab4cdeb4c10985d37c5af1609bcffc9799e211 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -771,6 +771,7 @@ typedef struct      //TODO: USE THIS!!!!
 \r
        sd_t            sd;\r
        //TODO: extend! and learn from keen/wolf/catacomb's code wwww\r
+       memptr  spribuff;       //temp\r
 } ca_t;\r
 \r
 //==========================================================================\r

diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
index fa1d96de3c48dbfcd5fd9f336ba984c7a640f93e..e2fb8626913d54314191746a7f590524b9f7cd4e 100755 (executable)
--- 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)\r
        {\r
                case 1:\r
-                       CA_ReadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\r
+                       CA_ReadFile(filename, &gvar->ca.spribuff, gvar);\r
+//TODO ++++                    CA_ReadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\r
                break;\r
                case 0:\r
-                       CA_LoadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\r
+                       CA_LoadFile(filename, &gvar->ca.spribuff, gvar);\r
+//TODO ++++                    CA_LoadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\r
                break;\r
        }\r
 \r
        // Insert sanity cheks later\r
-       enti->spri.spritesheet.buffer = enti->spri.spritesheet.spribuff;        //TODO: merge these 2 vars into 1\r
+       enti->spri.spritesheet.buffer = gvar->ca.spribuff;\r
+//TODO ++++    enti->spri.spritesheet.buffer = enti->spri.spritesheet.spribuff;        //TODO: merge these 2 vars into 1\r
        enti->spri.spritesheet.data_size = sizeof(enti->spri.spritesheet.buffer) - sizeof(struct vrl1_vgax_header);\r
        num_of_vrl = 0;\r
        vrl_id_iter = (uint16_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r

diff --git a/src/util/shbat/awoo.sh b/src/util/shbat/awoo.sh
index dcd8250c366bdc1806a0f80e4cebe595bd361698..7f561cc3345f31d68c1deb021775338857a564de 100755 (executable)
--- 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