xcroll fuckings please ignore and go to e9a094cdce9001737f17d3961f49f27272dff4e4

diff --git a/makefile b/makefile
index 19d47e5278574925444524be9e68776aa1478497..bb06aa4230bc91c6fb22d59ac9f8a23be1e91856 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -119,7 +119,7 @@ UPXQ=-qqq
 #
 # compile flags
 #
-S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k40960#32768#24576
+S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#24576
 Z_FLAGS=-zk0 -zc -zm#### -zp4 -ei
 O_FLAGS=-opnr -oe=24 -oil+ -outback -ohm
 T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1 -fo=.$(OBJ)## -e=65536

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
old mode 100755 (executable)
new mode 100644 (file)
index ce406dd..4a03920
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -163,8 +163,6 @@ CASVT GRFILEPOS(int c, global_game_variables_t *gvar)
 }\r
 #endif\r
 \r
-#define EXTENSION      "hb1"\r
-\r
 /*\r
 =============================================================================\r
 \r
@@ -1088,23 +1086,23 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
        CAL_GetGrChunkLength(STRUCTPIC,gvar);           // position file pointer\r
        printf("CAL_SetupGrFile:\n");\r
        printf("        gvar->ca.chunkcomplen size is %lu\n", gvar->ca.chunkcomplen);\r
-       MM_GetPtr(MEMPTRANDPERCONV compseg,gvar->ca.chunkcomplen,gvar);                                                         IN_Ack(gvar);\r
+       MM_GetPtr(&compseg,gvar->ca.chunkcomplen,gvar);\r
+       IN_Ack(gvar);\r
        CA_FarRead (gvar->ca.file.grhandle,compseg,gvar->ca.chunkcomplen,gvar);\r
        CAL_HuffExpand (compseg, (byte far *)gvar->video.pictable,NUMPICS*sizeof(pictabletype),gvar->ca.grhuffman);\r
-       MM_FreePtr(MEMPTRANDPERCONV compseg,gvar);\r
+       MM_FreePtr(&compseg,gvar);\r
 #endif\r
 \r
-#if 0\r
-       //NUMPICM>0\r
+#if NUMPICM>0\r
        MM_GetPtr(MEMPTRCONV picmtable,NUMPICM*sizeof(pictabletype));\r
        CAL_GetGrChunkLength(STRUCTPICM);               // position file pointer\r
        MM_GetPtr(&compseg,gvar->ca.chunkcomplen);\r
        CA_FarRead (gvar->ca.file.grhandle,compseg,gvar->ca.chunkcomplen);\r
        CAL_HuffExpand (compseg, (byte far *)picmtable,NUMPICS*sizeof(pictabletype),gvar->ca.grhuffman);\r
        MM_FreePtr(&compseg);\r
-//#endif\r
+#endif\r
 \r
-//#if NUMSPRITES>0\r
+#if NUMSPRITES>0\r
        MM_GetPtr(MEMPTRCONV spritetable,NUMSPRITES*sizeof(spritetabletype));\r
        CAL_GetGrChunkLength(STRUCTSPRITE);     // position file pointer\r
        MM_GetPtr(&compseg,gvar->ca.chunkcomplen);\r
@@ -1144,7 +1142,7 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
        MM_GetPtr (MEMPTRCONV gvar->ca.tinf,length,gvar);\r
        CA_FarRead(handle, gvar->ca.tinf, length,gvar);\r
        close(handle);\r
-#else\r
+//#else\r
 \r
        gvar->ca.tinf = (byte _seg *)FP_SEG(&maphead);\r
 \r
@@ -1261,7 +1259,7 @@ void CA_Startup(global_game_variables_t *gvar)
        CAL_SetupMapFile (gvar);\r
 #endif\r
 \r
-       gvar->ca.mapon = -1;\r
+       gvar->ca.camap.mapon = -1;\r
        gvar->ca.ca_levelbit = 1;\r
        gvar->ca.ca_levelnum = 0;\r
 \r
@@ -1895,7 +1893,7 @@ void CA_CacheGrChunk (int chunk)
 =\r
 ======================\r
 */\r
-\r
+/*++++ segments!\r
 void CA_CacheMap (global_game_variables_t *gvar)\r
 {\r
        long    pos,compressed;\r
@@ -1912,43 +1910,33 @@ void CA_CacheMap (global_game_variables_t *gvar)
 //\r
 // free up memory from last map\r
 //\r
-       if (gvar->ca.mapon>-1 && gvar->ca.mapheaderseg[gvar->ca.mapon])\r
-               MM_SetPurge ((MEMPTRCONV gvar->ca.mapheaderseg[(gvar->ca.mapon)]), 3, gvar);\r
+       if (gvar->ca.camap.mapon>-1 && gvar->ca.camap.mapheaderseg[gvar->ca.camap.mapon])\r
+               MM_SetPurge (((memptr)gvar->ca.camap.mapheaderseg[(gvar->ca.camap.mapon)]), 3, gvar);\r
        for (plane=0;plane<MAPPLANES;plane++)\r
-               if (gvar->ca.mapsegs[plane])\r
-                       MM_FreePtr (MEMPTRCONV gvar->ca.mapsegs[plane], gvar);\r
+               if (gvar->ca.camap.mapsegs[plane])\r
+                       MM_FreePtr ((memptr)gvar->ca.camap.mapsegs[plane], gvar);\r
 \r
-       gvar->ca.mapon = gvar->ca.mapnum;\r
+       gvar->ca.camap.mapon = gvar->ca.camap.mapnum;\r
 \r
 \r
 //\r
 // load map header\r
 // The header will be cached if it is still around\r
 //\r
-       if (!gvar->ca.mapheaderseg[gvar->ca.mapnum])\r
-       {\r
-               pos = ((mapfiletype     _seg *)gvar->ca.tinf)->headeroffsets[gvar->ca.mapnum];\r
-               if (pos<0)                                              // $FFFFFFFF start is a sparse map\r
-                       Quit (gvar, "CA_CacheMap: Tried to load a non existent map!");\r
+//     if (!gvar->ca.camap.mapheaderseg[gvar->ca.camap.mapnum])\r
+//     {\r
+//             //pos = ((mapfiletype   _seg *)tinf)->headeroffsets[mapnum];\r
+//             //pos = ((_seg *)gvar->ca.camap.tinf)->headeroffsets[gvar->ca.camap.mapnum];\r
+//             pos = ((memptr)gvar->ca.camap.tinf)->headeroffsets[gvar->ca.camap.mapnum];\r
+//             if (pos<0)                                              // $FFFFFFFF start is a sparse map\r
+//               printf("CA_CacheMap: Tried to load a non existent map!");\r
 \r
-               MM_GetPtr(MEMPTRCONV gvar->ca.mapheaderseg[gvar->ca.mapnum],sizeof(maptype), gvar);\r
-               lseek(gvar->ca.file.maphandle,pos,SEEK_SET);\r
-#ifdef MAPHEADERLINKED\r
-//#if BUFFERSIZE < sizeof(maptype)\r
-//The general buffer size is too small!\r
-//#endif\r
-               //\r
-               // load in, then unhuffman to the destination\r
-               //\r
-               CA_FarRead (gvar->ca.file.maphandle,gvar->mm.bufferseg,((mapfiletype    _seg *)gvar->ca.tinf)->headersize[gvar->ca.mapnum], gvar);\r
-               CAL_HuffExpand ((byte huge *)bufferseg,\r
-                       (byte huge *)gvar->ca.mapheaderseg[gvar->ca.mapnum],sizeof(maptype),maphuffman, gvar);\r
-#else\r
-               CA_FarRead (gvar->ca.file.maphandle,(memptr)gvar->ca.mapheaderseg[gvar->ca.mapnum],sizeof(maptype), gvar);\r
-#endif\r
-       }\r
-       else\r
-               MM_SetPurge (MEMPTRCONV gvar->ca.mapheaderseg[gvar->ca.mapnum], 0, gvar);\r
+//             MM_GetPtr(MEMPTRCONV gvar->ca.camapheaderseg[mapnum],sizeof(maptype));\r
+//             lseek(maphandle,pos,SEEK_SET);\r
+//             CA_FarRead (maphandle,(memptr)mapheaderseg[mapnum],sizeof(maptype));\r
+//     }\r
+//     else\r
+//             MM_SetPurge (MEMPTRCONV mapheaderseg[mapnum], 0, &(gvar->mm));\r
 \r
 //\r
 // load the planes in\r
@@ -1956,30 +1944,30 @@ void CA_CacheMap (global_game_variables_t *gvar)
 // allways reloaded, never cached)\r
 //\r
 \r
-       size = gvar->ca.mapheaderseg[gvar->ca.mapnum]->width * gvar->ca.mapheaderseg[gvar->ca.mapnum]->height * 2;\r
+       size = mapheaderseg[mapnum]->width * mapheaderseg[mapnum]->height * 2;\r
 \r
        for (plane = 0; plane<MAPPLANES; plane++)\r
        {\r
-               pos = gvar->ca.mapheaderseg[gvar->ca.mapnum]->planestart[plane];\r
-               compressed = gvar->ca.mapheaderseg[gvar->ca.mapnum]->planelength[plane];\r
+               //pos = mapheaderseg[mapnum]->planestart[plane];\r
+               //compressed = mapheaderseg[mapnum]->planelength[plane];\r
 \r
                if (!compressed)\r
                        continue;               // the plane is not used in this game\r
 \r
-               dest = MEMPTRCONV gvar->ca.mapsegs[plane];\r
-               MM_GetPtr(dest,size, gvar);\r
+               dest = MEMPTRCONV mapsegs[plane];\r
+               MM_GetPtr(dest,size);\r
 \r
-               lseek(gvar->ca.file.maphandle,pos,SEEK_SET);\r
+               lseek(maphandle,pos,SEEK_SET);\r
                if (compressed<=BUFFERSIZE)\r
-                       source = gvar->mm.bufferseg;\r
+                       source = bufferseg;\r
                else\r
                {\r
-                       MM_GetPtr(&bigbufferseg,compressed, gvar);\r
-                       MM_SetLock (&bigbufferseg,true, gvar);\r
+                       MM_GetPtr(&bigbufferseg,compressed);\r
+                       MM_SetLock (&bigbufferseg,true);\r
                        source = bigbufferseg;\r
                }\r
 \r
-               CA_FarRead(gvar->ca.file.maphandle,(byte far *)source,compressed, gvar);\r
+               CA_FarRead(maphandle,(byte far *)source,compressed);\r
 #ifdef MAPHEADERLINKED\r
                //\r
                // unhuffman, then unRLEW\r
@@ -1989,7 +1977,7 @@ void CA_CacheMap (global_game_variables_t *gvar)
                //\r
                expanded = *source;\r
                source++;\r
-               MM_GetPtr (&buffer2seg,expanded, gvar);\r
+               MM_GetPtr (&buffer2seg,expanded);\r
                CAL_CarmackExpand (source, (unsigned far *)buffer2seg,expanded);\r
                CA_RLEWexpand (((unsigned far *)buffer2seg)+1,*dest,size,\r
                ((mapfiletype _seg *)tinf)->RLEWtag);\r
@@ -2000,13 +1988,13 @@ void CA_CacheMap (global_game_variables_t *gvar)
                // unRLEW, skipping expanded length\r
                //\r
                CA_RLEWexpand (source+1, *dest,size,\r
-               ((mapfiletype _seg *)gvar->ca.tinf)->RLEWtag);\r
+               ((mapfiletype _seg *)tinf)->RLEWtag);\r
 #endif\r
 \r
                if (compressed>BUFFERSIZE)\r
-                       MM_FreePtr(&bigbufferseg, gvar);\r
+                       MM_FreePtr(&bigbufferseg);\r
        }\r
-}\r
+}//*/\r
 \r
 //===========================================================================\r
 \r
@@ -2140,20 +2128,20 @@ void CA_SetAllPurge (global_game_variables_t *gvar)
 //\r
 // free map headers and map planes\r
 //\r
-       for (i=0;i<NUMMAPS;i++)\r
-               if (gvar->ca.mapheaderseg[i])\r
-                       MM_SetPurge (MEMPTRCONV gvar->ca.mapheaderseg[i],3, gvar);\r
+//     for (i=0;i<NUMMAPS;i++)\r
+//             if (gvar->ca.camap.mapheaderseg[i])\r
+//                     MM_SetPurge (gvar->ca.camap.mapheaderseg[i],3, gvar);\r
 \r
        for (i=0;i<3;i++)\r
                if (gvar->ca.mapsegs[i])\r
-                       MM_FreePtr (MEMPTRCONV gvar->ca.mapsegs[i], gvar);\r
+                       MM_FreePtr ((memptr *)&gvar->ca.mapsegs[i], gvar);\r
 \r
 //\r
 // free sounds\r
 //\r
        for (i=0;i<NUMSNDCHUNKS;i++)\r
                if (gvar->ca.audiosegs[i])\r
-                       MM_SetPurge (MEMPTRCONV gvar->ca.audiosegs[i],3, gvar);\r
+                       MM_SetPurge ((memptr *)&gvar->ca.audiosegs[i],3, gvar);\r
 \r
 //\r
 // free graphics\r
@@ -2284,9 +2272,9 @@ void      CAL_DialogFinish (void)
 = CA_CacheMarks\r
 =\r
 ======================\r
-*/\r
+*//*++++\r
 #define MAXEMPTYREAD   1024\r
-/*++++ segments\r
+\r
 void CAL_CacheMarks (char *title, global_game_variables_t *gvar)\r
 {\r
        boolean dialog;\r
@@ -2321,8 +2309,8 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
 \r
 // MDM begin - (GAMERS EDGE)\r
 //\r
-//???? if (!FindFile("EGAGRAPH.16",NULL,2))\r
-//????         Quit (gvar, "CA_CacheMarks(): Can't find graphics files.");\r
+//     if (!FindFile("EGAGRAPH.16",NULL,2))\r
+//             Quit (gvar, "CA_CacheMarks(): Can't find graphics files.");\r
 //\r
 // MDM end\r
 \r
@@ -2425,7 +2413,7 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
 //\r
                if (dialog && finishcachebox)\r
                        finishcachebox();\r
-}//*/\r
+}*/\r
 \r
 void CA_CannotOpen(char *string, global_game_variables_t *gvar)\r
 {\r

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
old mode 100755 (executable)
new mode 100644 (file)
index 2d266df..e598d36
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -216,6 +216,7 @@ int newloadmap(char *mn, map_t *map) {
 //======\r
 \r
 \r
+#define MAPBUFINLM *(gvar->ca.mapsegs)\r
 int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar)\r
 {\r
        jsmn_parser p;\r
@@ -229,22 +230,20 @@ int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar)
        jsmn_init(&p);\r
 \r
        file_s = filesize(fh);\r
-       CA_LoadFile(mn, MEMPTRCONV MAPSEGINLM, gvar);\r
-       tokcount = jsmn_parse(&p, (char const *)MAPSEGINLM, file_s, NULL, 0);\r
+       CA_LoadFile(mn, (memptr *)&MAPBUFINLM, gvar);\r
+       tokcount = jsmn_parse(&p, (char const *)MAPBUFINLM, file_s, NULL, 0);\r
        tok = malloc(tokcount*sizeof(jsmntok_t));//TODO: USE MM_ CA_ AND PM_\r
 //     printf("Allocated %d tokens", tokcount);\r
        jsmn_init(&p);\r
-       if((status = jsmn_parse(&p, (char const *)MAPSEGINLM, file_s, tok, tokcount)) < 0)\r
+       if((status = jsmn_parse(&p, (char const *)MAPBUFINLM, file_s, tok, tokcount)) < 0)\r
        {\r
                printf("Error: %d\n", status);\r
                return status;\r
        }\r
        else if(status != tokcount) { printf("Warning: used %d tok\n", status);}\r
-       extract_map((char const *)MAPSEGINLM, tok, tokcount, map);\r
+       extract_map((char const *)MAPBUFINLM, tok, tokcount, map);\r
 \r
-//     printf("freeing tok\n");\r
        free(tok);      //TODO: USE MM_ CA_ AND PM_\r
-//     printf("fclose fh\n");\r
        fclose(fh);     //TODO: USE MM_ CA_ AND PM_\r
 \r
        return 0;\r

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
old mode 100755 (executable)
new mode 100644 (file)
index 94fecd9..165b5fd
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -84,8 +84,6 @@ typedef struct vrs_container{
        };\r
        // Array of corresponding vrl line offsets\r
        vrl1_vgax_offset_t **vrl_line_offsets;\r
-       //sprite buffer\r
-       byte far _seg *spribuff;\r
 } vrs_container_t;\r
 \r
 typedef struct vrl_container{\r
@@ -98,8 +96,6 @@ typedef struct vrl_container{
        };\r
        // Pointer to a corresponding vrl line offsets struct\r
        vrl1_vgax_offset_t *line_offsets;\r
-       //sprite buffer\r
-       byte far _seg *spribuff;\r
 } vrl_container_t;\r
 \r
 typedef struct sprite\r
@@ -366,7 +362,7 @@ typedef struct
 //===================================//\r
 #define PALSIZE                        768     //vga\r
 #define NUMCHUNKS              416     //keen\r
-//#define MAXSCANLINES 240     // size of ylookup table\r
+#define MAXSCANLINES   240     // size of ylookup table\r
 \r
 #define MAXSHIFTS              4\r
 #define STARTSPRITES   0       //temp\r
@@ -400,7 +396,7 @@ typedef struct
        word    quadwh;                 //preproccessed quad size of tilewidth and tileheight\r
 } tile_dimention_t;\r
 \r
-#define MAXSCROLLEDGES 2\r
+#define MAXSCROLLEDGES 6\r
 typedef struct\r
 {\r
        unsigned        panx,pany;              // panning adjustments inside port in pixels\r
@@ -457,7 +453,7 @@ typedef struct
        word            bordercolor;\r
        boolean fastpalette;\r
        byte            far     palette1[256][3],far palette2[256][3];\r
-//???? pictabletype    _seg *pictable;\r
+       pictabletype    _seg *pictable;\r
        //keen/cata vars\r
 //     spritetabletype _seg *spritetable;\r
 //     unsigned        *shifttabletable[8];\r
@@ -497,7 +493,7 @@ typedef struct
 //from 16_mm\r
 //==========================================================================\r
 \r
-#define MAXBLOCKS              600//800                //kd=1300 wolf3d=700 cata=600\r
+#define MAXBLOCKS              800//kd=1300 wolf3d=700 cata=600\r
 \r
 typedef struct mmblockstruct\r
 {\r
@@ -680,9 +676,9 @@ typedef struct
 #define NOGRAPHICS\r
 #define NOAUDIO\r
 \r
-//#define MAPHEADERLINKED\r
+#define MAPHEADERLINKED\r
 //#define GRHEADERLINKED\r
-//#define AUDIOHEADERLINKED\r
+#define AUDIOHEADERLINKED\r
 \r
 #define NUMMAPS                4//39\r
 #define NUMSNDCHUNKS           4//3\r
@@ -696,12 +692,9 @@ typedef struct
 #define GDICTNAME      DATADIR"vgadict."\r
 #define GHEADNAME      DATADIR"vgahead."\r
 #define GFILENAME      DATADIR"vgagraph."\r
+#define EXTENSION      "hb1"\r
 \r
 \r
-#define MAPSEGBUF      mapsegs\r
-#define MAPSEGPTR      MAPSEGBUF[0]\r
-#define MAPSEGINLM     (gvar->ca.MAPSEGPTR)\r
-\r
 typedef struct\r
 {\r
   word bit0,bit1;      // 0-255 is a character, > is a pointer to a node\r
@@ -717,10 +710,9 @@ typedef    struct
 \r
 typedef struct\r
 {\r
-       unsigned        RLEWtag;\r
-       long            headeroffsets[100];\r
-       byte            tileinfo[];\r
-} mapfiletype;\r
+       int             mapon, mapnum;\r
+       maptype         _seg    *mapheaderseg[NUMMAPS];\r
+} ca_mapinfo_t;\r
 \r
 typedef struct\r
 {\r
@@ -741,10 +733,9 @@ typedef struct     //TODO: USE THIS!!!!
 {\r
        byte    ca_levelbit,ca_levelnum;\r
        ca_handle_t             file;           //files to open\r
+       ca_mapinfo_t    camap;\r
 \r
        byte            _seg    *tinf;//?? where in the id engine is this used and what is it? --sparky4\r
-       int             mapon, mapnum;\r
-       maptype         _seg    *mapheaderseg[NUMMAPS];\r
        unsigned        _seg    *mapsegs[MAPPLANES];\r
        void            _seg    *grsegs[NUMCHUNKS];\r
        byte            far             grneeded[NUMCHUNKS];\r
@@ -756,19 +747,20 @@ typedef struct    //TODO: USE THIS!!!!
 #ifdef GRHEADERLINKED\r
        huffnode        *grhuffman;\r
 #else\r
-       huffnode        grhuffman[63];\r
+       huffnode        grhuffman[255];\r
 #endif\r
 \r
 #ifdef AUDIOHEADERLINKED\r
        huffnode        *audiohuffman;\r
 #else\r
-       huffnode        audiohuffman[63];\r
+       huffnode        audiohuffman[255];\r
 #endif\r
 \r
        CASVT           chunkcomplen,chunkexplen;//long\r
 \r
        sd_t            sd;\r
        //TODO: extend! and learn from keen/wolf/catacomb's code wwww\r
+       memptr  spribuff;\r
 } ca_t;\r
 \r
 //==========================================================================\r

diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
old mode 100755 (executable)
new mode 100644 (file)
index fa1d96d..056366a
--- a/src/lib/16_vrs.c
+++ b/src/lib/16_vrs.c
@@ -39,15 +39,15 @@ 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
                break;\r
                case 0:\r
-                       CA_LoadFile(filename, MEMPTRCONV enti->spri.spritesheet.spribuff, gvar);\r
+                       CA_LoadFile(filename, &gvar->ca.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
        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
@@ -112,15 +112,15 @@ void VRS_OpenVRL(char *filename, entity_t *enti, boolean rlsw, global_game_varia
        switch(rlsw)\r
        {\r
                case 1:\r
-                       CA_ReadFile(filename, &enti->spri.spritesheet.spribuff, gvar);\r
+                       CA_ReadFile(filename, &gvar->ca.spribuff, gvar);\r
                break;\r
                case 0:\r
-                       CA_LoadFile(filename, &enti->spri.spritesheet.spribuff, gvar);\r
+                       CA_LoadFile(filename, &gvar->ca.spribuff, gvar);\r
                break;\r
        }\r
 \r
        // Insert sanity cheks later\r
-       enti->spri.sprite_vrl_cont.buffer = enti->spri.spritesheet.spribuff;\r
+       enti->spri.sprite_vrl_cont.buffer = gvar->ca.spribuff;\r
        enti->spri.sprite_vrl_cont.data_size = sizeof(enti->spri.spritesheet.buffer) - sizeof(struct vrl1_vgax_header);\r
 \r
        // Allocate memory for vrl line offsets table\r