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

[16.git] / src / lib / 16_spri.c

diff --git a/src/lib/16_spri.c b/src/lib/16_spri.c
index 62c01aa44980ce3401d2f35c2639d8282667d3c1..c7c2b99d6b7895871d3329d27c8e011645798573 100755 (executable)
--- a/src/lib/16_spri.c
+++ b/src/lib/16_spri.c
@@ -21,6 +21,64 @@
  */\r
 \r
 #include "src/lib/16_spri.h"\r
+#include <hw/vga/vrl1xdrc.h>\r
+//void draw_vrl1_vgax_modex_strip(unsigned char far *draw,unsigned char far *s);\r
+\r
+//===========================================================================\r
+\r
+//#define NEWVRSDRAWFUN\r
+void DrawVRL (unsigned int x,unsigned int y,struct vrl1_vgax_header *hdr,vrl1_vgax_offset_t *lineoffs/*array hdr->width long*/,unsigned char *data,unsigned int datasz) {\r
+       unsigned char far *draw;\r
+       unsigned int vram_offset = (y * vga_state.vga_draw_stride) + (x >> 2),sx;\r
+       unsigned int vramlimit = vga_state.vga_draw_stride_limit;\r
+       unsigned char vga_plane = (x & 3);\r
+       unsigned char *s;\r
+\r
+//     byte    outputvars[72][128];\r
+       word a;//,by,bxmax,bymax;\r
+\r
+       printf("DrawVRL:\n");\r
+\r
+       /* draw one by one */\r
+       for (sx=0;sx < hdr->width;sx++) {\r
+               draw = vga_state.vga_graphics_ram + vram_offset;\r
+               vga_write_sequencer(0x02/*map mask*/,1 << vga_plane);\r
+               s = data + lineoffs[sx];\r
+               draw_vrl1_vgax_modex_strip(draw,s);\r
+\r
+               if(!sx)\r
+               for(a=0;a<hdr->height;a++)//hdr->width*\r
+               {\r
+//                     if((*(s+a)==0x0) && (*(s+(a+1))==0x20) && (*(s+(a+2))==0xff)) a+=2;\r
+//                     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
+//                             by++;\r
+               }\r
+\r
+               /* end of a vertical strip. next line? */\r
+               if ((++vga_plane) == 4) {\r
+                       if (--vramlimit == 0) break;\r
+                       vram_offset++;\r
+                       vga_plane = 0;\r
+               }\r
+       }\r
+#if 0\r
+       bxmax = sx; bymax = by;\r
+       for(by=0;by<bymax;by++)\r
+       {\r
+               for(sx=0;sx<bxmax;sx++)\r
+               {\r
+//                     if (!(sx%hdr->width) && sx ) printf("\n ");\r
+                       printf("%02x ", outputvars[sx][by]);\r
+               }\r
+               printf("\n      ");\r
+       }\r
+#endif\r
+}\r
+\r
+//===========================================================================\r
 \r
 char* get_curr_anim_name(struct sprite *spri)\r
 {\r
@@ -188,7 +246,12 @@ void animate_spri(entity_t *enti, video_t *video)
 #ifndef SPRITE\r
        modexClearRegion(&video->page[0], x, y, 16, 32, 1);\r
 #else\r
-       draw_vrl1_vgax_modex(\r
+#ifndef NEWVRSDRAWFUN\r
+       draw_vrl1_vgax_modex\r
+#else\r
+       DrawVRL\r
+#endif\r
+       (\r
                x-rx,\r
                y-ry,\r
                enti->spri.sprite_vrl_cont.vrl_header,\r