enti->spri is now enti.spri

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

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index fdd675a151530682cdeb48fdcfed6ea5563a9535..b4523474b50547d84b693ebc3ebc0e88d6cdd997 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -693,7 +693,7 @@ void shinku(global_game_variables_t *gv)
         // NTS: For some bizarre reason, gv->pee is not initialized, but the pointer is not NULL even\r
         //      though it should be. Instead it's NULL as a neAr pointer but contains a non-null\r
         //      segment value, so testing against NULL doesn't work. It is initialized properly if\r
-        //      you call start_timer() though which uses neAr malloc. Rather than fight with that,\r
+        //      you call start_timer() though which uses neAr mAlloc. Rather than fight with that,\r
         //      I decided it would be better to declare a temp buffer statically and sprintf to that.\r
         //\r
         //      This fixes *** Null pointer assignment detected error message in ZCROLL.EXE on exit.\r
@@ -794,13 +794,13 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn)
        }\r
        player[pn].enti.dire+=dd;\r
        //setting xy position\r
-       player[pn].enti.spri->x = x;\r
-       player[pn].enti.spri->y = y;\r
+       player[pn].enti.spri.x = x;\r
+       player[pn].enti.spri.y = y;\r
 \r
        if((player[pn].enti.q==1 && player[pn].enti.pred != player[pn].enti.d) || !dd)//when dir changed OR when player change face direction\r
        {\r
                //0000printf("  q=%u    pred=%u d=%u    dd=%u\n", player[pn].enti.q, player[pn].enti.pred, player[pn].enti.d, dd);\r
-               set_anim_by_id(player[pn].enti.spri, player[pn].enti.dire); //pip->video->sprifilei = set_anim_by_id(player[pn].enti.spri, player[pn].enti.dire);       if(pip->video->sprifilei == -1){ printf("ERROR! %u\n", player[pn].enti.dire); return; }\r
+               set_anim_by_id(&player[pn].enti.spri, player[pn].enti.dire); //pip->video->sprifilei = set_anim_by_id(player[pn].enti.spri, player[pn].enti.dire);      if(pip->video->sprifilei == -1){ printf("ERROR! %u\n", player[pn].enti.dire); return; }\r
                player[pn].enti.pred = player[pn].enti.d;\r
                if(!dd)//changed direction while NOT moving!\r
                {\r