i think something in animate_spri is making it jump a bunch

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 1aa40e7f32b8e4a9322a88afa1a21c0dd3e6b894..e2b2161d1fd61095a0aa908d53ff6252f3e8505e 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -266,6 +266,7 @@ typedef struct
        byte vga_draw_stride_limit;             // further X clipping\r
 //\r
        word __near rs;                 //render switch\r
+       int __near playerfilei;         //player file's i\r
        boolean __near p;                       //render page number //BLEH\r
        boolean __near r;                       //page flip if true\r
        word pr[MAXPAGE][4];    //render sections of pages (this is supposed to be set up to draw sections of the screen if updated)\r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index dacc9cbd8075cc03ec0940281388b057d1ee7496..e9d05c7862e03919b103285f1b7d75a7a170b546 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -1105,7 +1105,7 @@ void shinku(global_game_variables_t *gv)
 \r
 void near ZC_drawframe(map_view_t *pip, player_t *player, word pn, sword x, sword y, word dire, word sw)\r
 {\r
-       int i=0;\r
+       pip->video->playerfilei=0;\r
 \r
        switch(sw)\r
        {\r
@@ -1122,18 +1122,15 @@ void near ZC_drawframe(map_view_t *pip, player_t *player, word pn, sword x, swor
                        dire+=2;\r
                break;\r
        }\r
-       if(pip[0].video->rs<2)\r
-       {\r
-               i = set_anim_by_id(player[pn].ent->spri, dire); if (i == -1) return;\r
-               //printf("RS<2\n");\r
-       }\r
 \r
        switch(pip[0].video->rs)\r
        {\r
                case 0:\r
+                       pip->video->playerfilei = set_anim_by_id(player[pn].ent->spri, dire);   if(pip->video->playerfilei == -1) return;\r
                        animate_spri(player[pn].ent->spri, pip->video);\r
                break;\r
                case 1:\r
+                       pip->video->playerfilei = set_anim_by_id(player[pn].ent->spri, dire);   if(pip->video->playerfilei == -1) return;\r
                        oldanimate_spri(player[pn].ent->spri, pip->video);\r
                break;\r
                case 2:\r

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index eb6693dd4c8ef7928ece63e0a9b0f0b1718c4153..3d965c9043b4cd746d4c0d2639de7b2d9623c3b0 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -162,6 +162,7 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);
 void shinku(global_game_variables_t *gv);\r
 void near ZC_drawframe(map_view_t *pip, player_t *player, word pn, sword x, sword y, word dire, word sw);\r
 void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r
+void near ZC_animatePlayer_(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r
 void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r
 \r
 // Move an entity around. Should actually be in 16_entity\r