updated copyleft and need to test and fix newer version of open watcom

[proj16/16.git] / src / lib / 16_enti.c

diff --git a/src/lib/16_enti.c b/src/lib/16_enti.c
index cc41979..bf151be 100755 (executable)
--- a/src/lib/16_enti.c
+++ b/src/lib/16_enti.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2022 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -35,9 +35,9 @@ void EN_initentity(entity_t *enti, video_t *video)
        enti->d =               2;//dir var\r
        enti->pred =    4;//previous dir\r
        enti->hp =              4;//hit points\r
-       enti->speed =   4;//walkspeed\r
+       enti->spt =     4;//walkspeed\r
        enti->persist_aniframe = enti->q;\r
-       enti->spt=(TILEWH/(enti->speed));       //speed per tile wwww\r
+       enti->spt=(TILEWH/(enti->spt)); //speed per tile wwww\r
        enti->overdraww =       0;\r
        enti->overdrawh =       4;\r
 \r
@@ -46,7 +46,7 @@ void EN_initentity(entity_t *enti, video_t *video)
 //     modexClearRegion(&video->page[0], enti->x, enti->y, 16, 16, 2);\r
 //     modexClearRegion(&video->page[2], 0, 0, video->page[2].sw, video->page[2].sh, 45);\r
 //     modexClearRegion(&video->page[3], 0, 0, video->page[3].sw, video->page[3].sh, 47);\r
-       if(!video->bgps){\r
+       if(!video->vga_state.bgps){\r
                //video->ofs.pattern_ofs=(uint16_t)video->page[0].data;\r
                //video->ofs.offscreen_ofs=(uint16_t)video->page[3].data;\r
                w = (enti->x + 24) & (~3);\r
@@ -66,17 +66,17 @@ void EN_initentity(entity_t *enti, video_t *video)
 }\r
 \r
 //init player!\r
-void EN_initplayer(player_t *player, word pn, video_t *video)\r
+void EN_initPlayer(player_t *player, video_t *video)\r
 {\r
-       EN_initentity(&player[pn].enti, video);\r
-       player[pn].enti.spri->x = player[0].enti.x-4;\r
-       player[pn].enti.spri->y = player[0].enti.y-16;\r
-       player[pn].walktype=0;\r
-       player[pn].enti.dire=30;\r
+       EN_initentity(&player->enti, video);\r
+       player->enti.spri.x = player[0].enti.x-4;\r
+       player->enti.spri.y = player[0].enti.y-16;\r
+       player->walktype=0;\r
+       player->enti.dire=30;\r
        vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = video->page[0].stridew;//skewing bug\r
 \r
-       video->sprifilei =      set_anim_by_id(player[pn].enti.spri, player[pn].enti.dire);\r
-       animate_spri(&player[pn].enti, video);\r
+       video->sprifilei =      set_anim_by_id(&player->enti.spri, player->enti.dire);\r
+       animate_spri(&player->enti, video);\r
 \r
        //print_anim_ids(player[0].enti.spri);\r
 /*     player[0].info.x = player[0].tx;\r