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

diff --git a/XCROLL.LOG b/XCROLL.LOG
index b1501b6af321aa636852117993231484f4145ec5..c4fea9446cf5dc7ddab154724cfde17ddafaa8d0 100755 (executable)
--- a/XCROLL.LOG
+++ b/XCROLL.LOG
@@ -9,42 +9,12 @@ Object 4's name: 'stump'
                      "walkable":"0"\r
                     }\r
                walkable: 0\r
-DrawVRL:\r
-[00]   85\r
-[01]   00\r
-[02]   0b\r
-[03]   86\r
-[04]   00\r
-[05]   02\r
-[06]   88\r
-[07]   01\r
-[08]   0b\r
-[09]   88\r
-[10]   04\r
-[11]   0b\r
-[12]   ff\r
-[13]   84\r
-[14]   00\r
-[15]   0b\r
-[16]   06\r
-[17]   00\r
-[18]   02\r
-[19]   06\r
-[20]   04\r
-[21]   04\r
-[22]   03\r
-[23]   02\r
-[24]   87\r
-[25]   01\r
-[26]   0b\r
-[27]   01\r
-[28]   02\r
-[29]   05\r
-[30]   02\r
-[31]   01\r
+VRS_OpenVRS\r
+       vrl_size=515\r
+\r
 \r
 Project 16 xcroll.exe. This is just a test file!\r
-version May  3 2017 13:29:21\r
+version May  3 2017 15:15:20\r
 page[0]dxy: 16x16\r
 \r
 player vars:\r

diff --git a/data/G.PAL b/data/G.PAL
index bdc3b00c28e43da344b0076ca8feee03370f73ac..34da18d07d1b14cc3ff233f7e8b1a01281ffcc61 100755 (executable)
Binary files a/data/G.PAL and b/data/G.PAL differ

diff --git a/data/chikyuu.pcx b/data/chikyuu.pcx
index 049e4bcf4e5f61efac597d73a37738b5324f1764..72b1e69eebd76c395291e7b41f3fc014aed4f09f 100755 (executable)
Binary files a/data/chikyuu.pcx and b/data/chikyuu.pcx differ

diff --git a/data/me.pcx b/data/me.pcx
index 6e78ab972cc4ad5394839cb30df62fd4e66e289f..b7dce67f40c23aa16f60dec4f4d79647dc4a78d3 100755 (executable)
Binary files a/data/me.pcx and b/data/me.pcx differ

diff --git a/data/mebak.pcx b/data/mebak.pcx
new file mode 100755 (executable)
index 0000000..6e78ab9
Binary files /dev/null and b/data/mebak.pcx differ

diff --git a/data/spri/CHUBFCW0.VRL b/data/spri/CHUBFCW0.VRL
index af1b4956a34a98069b8280b017a10db336d03294..75d5a6e46e90a41bbe26dff7c9165d175947ab34 100755 (executable)
Binary files a/data/spri/CHUBFCW0.VRL and b/data/spri/CHUBFCW0.VRL differ

diff --git a/data/spri/MEBACW0.VRL b/data/spri/MEBACW0.VRL
index 88ff88ff4bd8ec16ef6d4e3cba660fcf9ee90e2b..9aa0ffbff242cb26eaf36a1afe72a78a8b6dc053 100755 (executable)
Binary files a/data/spri/MEBACW0.VRL and b/data/spri/MEBACW0.VRL differ

diff --git a/data/spri/MEBACW1.VRL b/data/spri/MEBACW1.VRL
index 314def27fa891349984b4aeafce619111b0ddaa2..4aea51d46292fc74bd23f0fbd43d0985d5cc149f 100755 (executable)
Binary files a/data/spri/MEBACW1.VRL and b/data/spri/MEBACW1.VRL differ

diff --git a/data/spri/MEBACW2.VRL b/data/spri/MEBACW2.VRL
index eddc1ee6efff8a2a41bb44b1e145a79e6054bbe1..d13f08d078c6ed64aea42bf9271297464ea5dfd6 100755 (executable)
Binary files a/data/spri/MEBACW2.VRL and b/data/spri/MEBACW2.VRL differ

diff --git a/data/spri/MEBFCW0.VRL b/data/spri/MEBFCW0.VRL
index 8d93837bdf214d7ea1e6d18fcb6cc0cf6976d828..66b6f71fdb1de69143a6f1e917a9e1fbbcbd9d42 100755 (executable)
Binary files a/data/spri/MEBFCW0.VRL and b/data/spri/MEBFCW0.VRL differ

diff --git a/data/spri/MEBFCW1.VRL b/data/spri/MEBFCW1.VRL
index db868ea3feb327563e575ffb2ba29bd7ec6a5040..63f069e110ab032508511bf681cc3e6228de63ca 100755 (executable)
Binary files a/data/spri/MEBFCW1.VRL and b/data/spri/MEBFCW1.VRL differ

diff --git a/data/spri/MEBFCW2.VRL b/data/spri/MEBFCW2.VRL
index 338502eb5db1bb0c2ec0991d71a02e0693175d10..b58153d3ee17ceb637c441b5b92d5389bfc02f08 100755 (executable)
Binary files a/data/spri/MEBFCW2.VRL and b/data/spri/MEBFCW2.VRL differ

diff --git a/data/spri/MEBLCW0.VRL b/data/spri/MEBLCW0.VRL
index b9549159df245f5637e3c8d6ec337ba9104c16c9..3dfeb8095a9f15f9b8da78124689617a43fbdf1b 100755 (executable)
Binary files a/data/spri/MEBLCW0.VRL and b/data/spri/MEBLCW0.VRL differ

diff --git a/data/spri/MEBLCW1.VRL b/data/spri/MEBLCW1.VRL
index 616b7cb2036ce9745621160e6df4bdecea1199c1..4dff6495141b76088e6201afc6bec293ab526ebe 100755 (executable)
Binary files a/data/spri/MEBLCW1.VRL and b/data/spri/MEBLCW1.VRL differ

diff --git a/data/spri/MEBLCW2.VRL b/data/spri/MEBLCW2.VRL
index 689eebdbdf08615c798ee0dbf259be70a948da4e..90f32cf9b0e15a03209ba5a6aebb52ee03f536d0 100755 (executable)
Binary files a/data/spri/MEBLCW2.VRL and b/data/spri/MEBLCW2.VRL differ

diff --git a/data/spri/MEBRCW0.VRL b/data/spri/MEBRCW0.VRL
index 45eaba804edc5944b268782341dd2b61cd980bb9..843dc3d85e87a1411a015b68ae97b64caef9aa96 100755 (executable)
Binary files a/data/spri/MEBRCW0.VRL and b/data/spri/MEBRCW0.VRL differ

diff --git a/data/spri/MEBRCW1.VRL b/data/spri/MEBRCW1.VRL
index ab88635c5d6dd853ac6de60e89080c04737e3b66..0039fd18cd9a42c851bb2031fd33b7b92f147361 100755 (executable)
Binary files a/data/spri/MEBRCW1.VRL and b/data/spri/MEBRCW1.VRL differ

diff --git a/data/spri/MEBRCW2.VRL b/data/spri/MEBRCW2.VRL
index 64c3543a075a8298b139f293fcb21fe01065d669..76028914e468a79231b1de2e31127bce89e7a391 100755 (executable)
Binary files a/data/spri/MEBRCW2.VRL and b/data/spri/MEBRCW2.VRL differ

diff --git a/data/spri/chikyuu.pal b/data/spri/chikyuu.pal
index 1fc14ee725663e77af99c1239d8ca9f9efdf30b4..d347e50a40ff00c73720fa2688f663d5087650ac 100755 (executable)
Binary files a/data/spri/chikyuu.pal and b/data/spri/chikyuu.pal differ

diff --git a/data/spri/chistnd.vrs b/data/spri/chistnd.vrs
index 401ca63b4efd2c22b8655e45221dddcc5878fc96..48720e945f26e7d7acda160c074b1ad714da3782 100755 (executable)
Binary files a/data/spri/chistnd.vrs and b/data/spri/chistnd.vrs differ

diff --git a/data/spri/me.pal b/data/spri/me.pal
index f67f2c3d4c7a384e12c0ea3ccdf5413ebb54ec77..ae38e163f8ff9437d91eb10b3f3d1d16275cdde8 100755 (executable)
Binary files a/data/spri/me.pal and b/data/spri/me.pal differ

diff --git a/data/spri/me.vrl b/data/spri/me.vrl
index 6882abe57e06d2c0b5c7461316c2ef78410b87f8..f7bf346e7cac88cb0b5419d49917e5920d997b1b 100755 (executable)
Binary files a/data/spri/me.vrl and b/data/spri/me.vrl differ

diff --git a/data/spri/me.vrs b/data/spri/me.vrs
index ae522653b6ae6d31affd9c746e8b7c2c455e0432..ef3bdff93958f7fdacf93a3c19f2f8f5a6ee8aee 100755 (executable)
Binary files a/data/spri/me.vrs and b/data/spri/me.vrs differ

diff --git a/src/0tesuto.c b/src/0tesuto.c
index fb3d0fc908ebf8c2f972324c5fc6aefbe603ed68..f83715850d8ccf11ae4874670a962d16c6a9c104 100755 (executable)
--- a/src/0tesuto.c
+++ b/src/0tesuto.c
@@ -29,9 +29,11 @@
 \r
 //#define FILENAME_1 "data/aconita.vrl"\r
 //#define FILENAME_2 "data/aconita.pal"\r
-#define FILENAME_1 "data/spri/chikyuu.vrl"\r
+#define FILENAME_1 "data/spri/chistnd.vrl"\r
 #define FILENAME_2 "data/spri/chikyuu.pal"\r
 \r
+//#define ZSP\r
+\r
 #define INITTNUM 1\r
 \r
 map_view_t mv[4];\r
@@ -41,7 +43,7 @@ int main(int argc,char **argv)
 {\r
        static global_game_variables_t gvar;\r
        struct vrl1_vgax_header *vrl_header;\r
-       vrl1_vgax_offset_t *vrl_lineoffs;\r
+       vrl1_vgax_offset_t *line_offsets;\r
        unsigned char *buffer;\r
        unsigned int bufsz;\r
        int fd;\r
@@ -50,10 +52,10 @@ int main(int argc,char **argv)
        char bakapee1[64] = FILENAME_1;\r
        char bakapee2[64] = FILENAME_2;\r
 \r
-       boolean anim=1,noanim=0,zerostoppause=1;\r
-\r
-//     bakapee1=mALLoc(64);\r
-//     bakapee2=mALLoc(64);\r
+       boolean anim=1,noanim=0;\r
+#ifdef ZSP\r
+       boolean zerostoppause=1;\r
+#endif\r
 \r
        if (argc >= 2) {\r
 /*     if (argc < 2) {\r
@@ -103,8 +105,8 @@ int main(int argc,char **argv)
        VL_LoadPalFile(bakapee2, &gvar.video.palette, &gvar);\r
 \r
        /* preprocess the sprite to generate line offsets */\r
-       vrl_lineoffs = vrl1_vgax_genlineoffsets(vrl_header,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
-       if (vrl_lineoffs == NULL) return 1;\r
+       line_offsets = vrl1_vgax_genlineoffsets(vrl_header,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
+       if (line_offsets == NULL) return 1;\r
 \r
        IN_Startup(&gvar);\r
        IN_Default(0,&gvar.player[0],ctrl_Keyboard1, &gvar);\r
@@ -148,11 +150,17 @@ int main(int argc,char **argv)
                        IN_ReadControl(&gvar.player[0], &gvar);\r
                        if(gvar.in.inst->Keyboard[68]){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } //f10\r
                        TAIL_PANKEYFUN;\r
-                       if(gvar.in.inst->Keyboard[sc_Space] || zerostoppause)   //space\r
+                       if(gvar.in.inst->Keyboard[sc_Space]\r
+#ifdef ZSP\r
+                               || zerostoppause\r
+#endif\r
+)      //space\r
                        {\r
                                anim=!anim;\r
                                DRAWCORNERBOXES;\r
+#ifdef ZSP\r
                                if(!zerostoppause) IN_UserInput(1, &gvar); else zerostoppause=0;\r
+#endif\r
                        }\r
                        if(gvar.in.inst->Keyboard[sc_R]){\r
                                gvar.video.page[0].dx=gvar.video.page[0].dy=gvar.video.page[1].dx=gvar.video.page[1].dy=16;\r
@@ -190,7 +198,7 @@ int main(int argc,char **argv)
                                vga_state.vga_graphics_ram = omemptr + gvar.video.page[0].pagesize + gvar.video.page[1].pagesize;\r
 \r
                                /* then the sprite. note modding ram ptr means we just draw to (x&3,0) */\r
-draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
+draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,line_offsets,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
 //printf("x=%d y=%d    rx=%d   ry=%d\n", x, y, rx, ry);\r
 \r
                                /* restore ptr */\r
@@ -308,7 +316,7 @@ if(!noanim) {
 }\r
        IN_Shutdown(&gvar);\r
        VGAmodeX(0, 1, &gvar);\r
-       free(vrl_lineoffs);\r
+       free(line_offsets);\r
        buffer = NULL;\r
        free(buffer);\r
        bufsz = 0;\r

diff --git a/src/lib/16_spri.c b/src/lib/16_spri.c
index c7c2b99d6b7895871d3329d27c8e011645798573..502ed4a43a29a119b029d30329aed83aabf67eef 100755 (executable)
--- a/src/lib/16_spri.c
+++ b/src/lib/16_spri.c
@@ -53,7 +53,7 @@ void DrawVRL (unsigned int x,unsigned int y,struct vrl1_vgax_header *hdr,vrl1_vg
 //                     if(*(s+a)<=13)\r
 //                             if (!(a%4) && a ) printf("\n");\r
 //                             sprintf(outputvars[sx][by], "%02x", *(s+a));\r
-                               printf("[%02u]  %02x\n", a, *(s+a));\r
+                               printf("[%02u]  %u\n", a, *(s+a));\r
 //                             by++;\r
                }\r
 \r

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index dc53d947ba18e67c1f629c689fdb0be349f31301..77c5fad2e4839df1202869b259ab7041e97cff33 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -918,7 +918,9 @@ modexLoadPalFile(byte *filename, byte *palette) {
 \r
 void VL_LoadPalFile(const char *filename, byte *palette, global_game_variables_t *gvar)\r
 {\r
-       VL_LoadPalFilewithoffset(filename, palette, 9, gvar);\r
+       VL_LoadPalFilewithoffset(filename, palette,\r
+               0, gvar);\r
+               //9, gvar);\r
 //     VL_LoadPalFileCore(palette);\r
 }\r
 \r

diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
index 834754dddc2928f7b548465ebee63f6fed20ea13..0edcf627dc6fa83505673ff14c96c1a33994d966 100755 (executable)
--- a/src/lib/16_vrs.c
+++ b/src/lib/16_vrs.c
@@ -35,7 +35,6 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
        struct vrl1_vgax_header far *curr_vrl;\r
        uint32_t vrl_size;\r
        int num_of_vrl,i;\r
-       int size=0;\r
 \r
        switch(rlsw)\r
        {\r
@@ -49,7 +48,7 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
 \r
        // Insert sanity cheks later\r
        enti->spri.spritesheet.buffer = gvar->ca.spribuff;\r
-       enti->spri.spritesheet.data_size = size - sizeof(struct vrl1_vgax_header);\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
        while(vrl_id_iter[num_of_vrl]){\r
@@ -60,8 +59,8 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
 #ifndef VRS_USECAMMPM\r
        vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);//TODO: USE MM_ CA_ AND PM_\r
 #else\r
-       MM_GetPtr(MEMPTRCONV gvar->ca.grsegs[0], sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);\r
-       enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)gvar->ca.grsegs[0];\r
+       MM_GetPtr(MEMPTRCONV gvar->ca.grsegs, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);\r
+       enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)gvar->ca.grsegs;\r
 #endif\r
 \r
        vrl_headers_offsets = (uint32_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
@@ -86,20 +85,21 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
 #ifndef VRS_USECAMMPM\r
        enti->spri.spritesheet.vrl_line_offsets = vrl_line_offsets;\r
 #endif\r
+//     printf("VRS_OpenVRS\n");\r
+//     printf("        vrl_size=%lu\n\n",vrl_size);\r
 }\r
 \r
+#if 0\r
+//\r
 void VRS_ReadVRL(char *filename, entity_t *enti, global_game_variables_t *gvar){       VRS_OpenVRL(filename, enti, 1, gvar);   }\r
 void VRS_LoadVRL(char *filename, entity_t *enti, global_game_variables_t *gvar){       VRS_OpenVRL(filename, enti, 0, gvar);   }\r
 void VRS_OpenVRL(char *filename, entity_t *enti, boolean rlsw, global_game_variables_t *gvar)\r
 {\r
-       vrl1_vgax_offset_t *vrl_line_offsets;\r
-//     struct vrl1_vgax_header *vrl_header;\r
-//     uint16_t far *vrl_id_iter;\r
+#ifndef VRL_USECAMMPM\r
+       vrl1_vgax_offset_t *line_offsets;\r
+#endif\r
 //     uint32_t far *vrl_headers_offsets;\r
-//     struct vrl1_vgax_header far *curr_vrl;\r
-       uint32_t vrl_size;\r
-//     int num_of_vrl,i;\r
-       int size=0;\r
+       struct vrl1_vgax_header far *curr_vrl;\r
 \r
        switch(rlsw)\r
        {\r
@@ -113,50 +113,34 @@ void VRS_OpenVRL(char *filename, entity_t *enti, boolean rlsw, global_game_varia
 \r
        // Insert sanity cheks later\r
        enti->spri.sprite_vrl_cont.buffer = gvar->ca.spribuff;\r
-       enti->spri.sprite_vrl_cont.data_size = size - sizeof(struct vrl1_vgax_header);\r
-\r
-       vrl_size = enti->spri.sprite_vrl_cont.buffer - enti->spri.sprite_vrl_cont.buffer - sizeof(struct vrl1_vgax_header);\r
-//     vrl_header = (struct vrl1_vgax_header far *)(enti->spri.sprite_vrl_cont.buffer + enti->spri.sprite_vrl_cont.buffer);\r
-#if 0\r
-       num_of_vrl = 0;\r
-       while(vrl_id_iter[num_of_vrl]){\r
-               num_of_vrl++;\r
-       }\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
-//#ifndef VRS_USECAMMPM\r
-       vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);//TODO: USE MM_ CA_ AND PM_\r
-//#else\r
-       MM_GetPtr(MEMPTRCONV gvar->ca.grsegs[0], sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);\r
-       enti->spri.sprite_vrl_cont.vrl_line_offsets = (vrl1_vgax_offset_t **)gvar->ca.grsegs[0];\r
-//#endif\r
+#ifndef VRL_USECAMMPM\r
+       line_offsets = malloc(sizeof(vrl1_vgax_offset_t *));//TODO: USE MM_ CA_ AND PM_\r
+#else\r
+       MM_GetPtr(MEMPTRCONV gvar->ca.grsegs[0], sizeof(vrl1_vgax_offset_t *), gvar);\r
+       enti->spri.sprite_vrl_cont.line_offsets = (vrl1_vgax_offset_t *)gvar->ca.grsegs[0];\r
+#endif\r
 \r
-       vrl_headers_offsets = (uint32_t far *)(enti->spri.sprite_vrl_cont.buffer + enti->spri.sprite_vrl_cont.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
+       //vrl_headers_offsets = (uint32_t far *)(enti->spri.sprite_vrl_cont.buffer + enti->spri.sprite_vrl_cont.vrs_hdr->offset_table[VRL_HEADER_OFFSET_VRL_LIST]);\r
        // Calculate line offsets for each vrl\r
-       for(i = 0; i < num_of_vrl; i++){\r
-               curr_vrl = (struct vrl1_vgax_header far *)(enti->spri.sprite_vrl_cont.buffer + vrl_headers_offsets[i]);\r
+               curr_vrl = (struct vrl1_vgax_header far *)(enti->spri.sprite_vrl_cont.buffer);// + vrl_headers_offsets);\r
 \r
-               // Calc. vrl size as (next_offset - curr_offset)\r
-               if (i != num_of_vrl - 1){\r
-                       vrl_size = vrl_headers_offsets[i+1] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);\r
-               }\r
-               // If it's the last vrl, size is (next_vrs_struct_offset - curr_offset)\r
-               else{\r
-                       vrl_size = enti->spri.sprite_vrl_cont.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);\r
-               }\r
-#ifndef VRS_USECAMMPM\r
-               vrl_line_offsets = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);\r
+#ifndef VRL_USECAMMPM\r
+               line_offsets = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), sizeof(enti->spri.spritesheet.buffer));\r
 #else\r
-               enti->spri.sprite_vrl_cont.vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);\r
-#endif\r
-       }\r
+               enti->spri.sprite_vrl_cont.line_offsets = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), sizeof(enti->spri.spritesheet.buffer));\r
 #endif\r
 \r
-               vrl_line_offsets = vrl1_vgax_genlineoffsets(enti->spri.sprite_vrl_cont.vrl_header,      (byte *)enti->spri.sprite_vrl_cont.buffer + sizeof(struct vrl1_vgax_header),    vrl_size);\r
-#ifndef VRS_USECAMMPM\r
-       enti->spri.sprite_vrl_cont.vrl_line_offsets = vrl_line_offsets;\r
+#ifndef VRL_USECAMMPM\r
+       enti->spri.sprite_vrl_cont.line_offsets = line_offsets;\r
 #endif\r
+       printf("VRS_OpenVRL\n");\r
+       printf("        vrl_size=%lu\n\n",sizeof(enti->spri.spritesheet.buffer));\r
 }\r
+//\r
+#endif\r
 \r
 // Seek and return a specified .vrl blob from .vrs blob in far memory\r
 int get_vrl_by_id(struct vrs_container far *vrs_cont, uint16_t id, struct vrl_container *vrl_cont){\r

diff --git a/src/util/shbat/respri.sh b/src/util/shbat/respri.sh
new file mode 100755 (executable)
index 0000000..79bc4f1
--- /dev/null
+++ b/src/util/shbat/respri.sh
@@ -0,0 +1,5 @@
+#! /bin/bash
+rm data/spri/"$1".vr*
+rm data/spri/"$1".pal
+. ./spri.sh "$1"
+. ./spri.sh "$1"

diff --git a/src/xcroll.c b/src/xcroll.c
index e31ff558c51125bcf315ccce367c9905bea395db..7e93de09e9421bdeb42d7df3fee6a7f5a32a8f8d 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -46,7 +46,7 @@ memptr pal;
 #define FILENAME_1P    "data/spri/chikyuu.pal"\r
 #define FILENAME_2     "data/spri/me.vrs"\r
 #define FILENAME_2P    "data/spri/me.pal"\r
-#define FILENAME_3     "data/spri/chistnd.vrl"\r
+//#define FILENAME_3   "data/spri/chistnd.vrl"\r
 \r
 void main(int argc, char *argv[])\r
 {\r
@@ -57,7 +57,7 @@ void main(int argc, char *argv[])
 \r
        char bakapee[64] = FILENAME_1;\r
        char bakapeep[64] = FILENAME_1P;\r
-       char bakapee3[64] = FILENAME_3;\r
+//     char bakapee3[64] = FILENAME_3;\r
 \r
        Startup16(&gvar);\r
 \r
@@ -86,7 +86,6 @@ void main(int argc, char *argv[])
 #endif\r
        // data\r
        VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar);\r
-//     VRS_LoadVRS(bakapee3, &enti, &gvar);\r
 \r
        // input!\r
        IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);\r
@@ -200,7 +199,7 @@ void main(int argc, char *argv[])
                if(gvar.in.inst->Keyboard[sc_LBrkt]){ ShowPalVal (&gvar);                                                               IN_UserInput(1, &gvar); }\r
 \r
 //===============================================================================\r
-\r
+#if 0\r
                if(gvar.in.inst->Keyboard[sc_BackSlash]){\r
                        VRS_ReadVRL(bakapee3, &gvar.player[0].enti, &gvar);\r
                        DrawVRL(\r
@@ -213,7 +212,7 @@ void main(int argc, char *argv[])
                        );      while (!IN_CheckAck (&gvar)){}\r
                        VRS_ReadVRS(bakapee, &gvar.player[0].enti, &gvar);\r
                IN_UserInput(1, &gvar); }\r
-\r
+#endif\r
 //===============================================================================\r
 \r
                if(gvar.in.inst->Keyboard[sc_J] || gvar.in.inst->Keyboard[sc_K])\r