something is bothering me very much on the animation part of frame. particularly...

[16.git] / src / 0.c

diff --git a/src/0.c b/src/0.c
index d1be46fd0f0e0382dffa0627660225610561948d..b909273f88d9376857d75ab9a1e0f549d75c09e6 100755 (executable)
--- a/src/0.c
+++ b/src/0.c
@@ -15,7 +15,6 @@
 static byte palette[768];\r
 player_t player[MaxPlayers];\r
 map_view_t mv[4];\r
-pan_t pan;\r
 \r
 map_t map;//junk var\r
 \r
@@ -32,7 +31,7 @@ int main(int argc,char **argv)
 \r
        boolean anim=1,noanim=0;\r
 \r
-       pan.pn=0;\r
+       gvar.video.panp=0;\r
 \r
        bakapee1=malloc(64);\r
        bakapee2=malloc(1024);\r
@@ -88,12 +87,12 @@ int main(int argc,char **argv)
 \r
        IN_Startup();\r
        IN_Default(0,&player,ctrl_Keyboard1);\r
-       IN_initplayer(&player, 0);\r
+       EN_initplayer(&player, 0);\r
 \r
        /* setup camera and screen~ */\r
        modexHiganbanaPageSetup(&gvar.video);\r
-       ZC_MVSetup(&mv, &map, &pan, &gvar);\r
-       //VL_ShowPage(&(gvar.video.page[pan.pn]), 0, 0);\r
+       ZC_MVSetup(&mv, &map, &gvar);\r
+       //VL_ShowPage(&(gvar.video.page[gvar.video.panp]), 0, 0);\r
        ZC_ShowMV(&mv, 0, 0);\r
 \r
        //DRAWCORNERBOXES;\r
@@ -141,8 +140,8 @@ int main(int argc,char **argv)
                        if(IN_KeyDown(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
                                mv[0].tx = mv[0].ty = mv[1].tx = mv[1].ty = INITTNUM;\r
-                               modexShowPage(&(gvar.video.page[pan.pn]));\r
-                               player[0].q = 1; player[0].d = 2;\r
+                               modexShowPage(&(gvar.video.page[gvar.video.panp]));\r
+                               player[0].enti.q = 1; player[0].enti.d = 2;\r
                                x=y=0;\r
                                xdir=ydir=1;\r
                                //TESTBG;\r
@@ -177,6 +176,7 @@ int main(int argc,char **argv)
 \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
+//printf("x=%d y=%d    rx=%d   ry=%d\n", x, y, rx, ry);\r
 \r
                                /* restore ptr */\r
                                vga_state.vga_graphics_ram = omemptr;\r