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 f2c58ff3e021a28ff2ffbfd32c999456f8d09d49..62c01aa44980ce3401d2f35c2639d8282667d3c1 100755 (executable)
--- a/src/lib/16_spri.c
+++ b/src/lib/16_spri.c
@@ -101,6 +101,7 @@ void animate_spri(entity_t *enti, video_t *video)
 #define INC_PER_FRAME if(enti->q&1) enti->persist_aniframe++; if(enti->persist_aniframe>4) enti->persist_aniframe = 1;\r
        unsigned int i,o,o2; int j;\r
        int x,y,rx,ry,w,h;\r
+       static struct glob_game_vars *ggvv;\r
        VGA_RAM_PTR omemptr = (VGA_RAM_PTR)video->page[0].data;// save original mem ptr\r
 \r
        x=enti->spri.x;\r
@@ -156,7 +157,7 @@ void animate_spri(entity_t *enti, video_t *video)
        }\r
 \r
        // render box bounds. y does not need modification, but x and width must be multiple of 4\r
-       if(!video->rss)\r
+       if(!video->vga_state.rss)\r
        {\r
                if (x >= enti->overdraww) rx = (x - enti->overdraww) & (~3);\r
                        else rx = -(video->page[0].dx);\r
@@ -167,7 +168,7 @@ void animate_spri(entity_t *enti, video_t *video)
                if ((rx+w) > video->page[0].width) w = video->page[0].width-rx;\r
                if ((ry+h) > video->page[0].height) h = video->page[0].height-ry;\r
 \r
-               if(!video->bgps){\r
+               if(!video->vga_state.bgps){\r
                        // block copy pattern to where we will draw the sprite\r
                        vga_setup_wm1_block_copy();\r
                        o2 = video->ofs.offscreen_ofs;\r
@@ -197,14 +198,18 @@ void animate_spri(entity_t *enti, video_t *video)
        );\r
 #endif\r
 #ifdef __DEBUG_SPRI__\r
-       if(dbg_delayanimation) delay(250);//{ while(!IN_KeyDown(sc_Space)/* && !IN_KeyDown(sc_Escape)*/){} delay(250); }\r
+//     if(ggvv->player[0].enti.q<5)\r
+       if(dbg_delayanimation)\r
+       {\r
+               IN_Ack(ggvv);// delay(250);//{ while(!IN_KeyDown(sc_Space)/* && !IN_KeyDown(sc_Escape)*/){} delay(250); }\r
+       }\r
 #endif\r
-       if(!video->rss)\r
+       if(!video->vga_state.rss)\r
        {\r
                // restore ptr\r
                vga_state.vga_graphics_ram = omemptr;\r
 \r
-               if(!video->bgps){\r
+               if(!video->vga_state.bgps){\r
                        // block copy to visible RAM from offscreen\r
                        vga_setup_wm1_block_copy();\r
                        o = video->ofs.offscreen_ofs; // source offscreen\r
@@ -217,6 +222,6 @@ void animate_spri(entity_t *enti, video_t *video)
        // restore stride\r
        vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = video->page[0].stridew;\r
 \r
-       vga_state.vga_graphics_ram = video->omemptr;\r
+       vga_state.vga_graphics_ram = video->vga_state.omemptr;\r
        video->dorender=1;\r
 }\r