updated the copyleft wwww i am not deAD! i just been 2 busy last 6 monthes

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

diff --git a/src/lib/16_enti.c b/src/lib/16_enti.c
index 19df4fd5bc2beb283598b8c4e385b915b723c6a8..eb9fa1a36afb311a22f6ae1ae32b1d811a78560a 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-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -31,23 +31,22 @@ void EN_initentity(entity_t *enti, video_t *video)
        enti->triggerx = enti->tx;\r
        enti->triggery = enti->ty+1;    //south\r
 \r
-       enti->q = 1;\r
-       enti->d =2;\r
-       enti->hp=4;\r
-       enti->speed=4;\r
+       enti->q =               1;//loop var\r
+       enti->d =               2;//dir var\r
+       enti->pred =    4;//previous dir\r
+       enti->hp =              4;//hit points\r
+       enti->spt =     4;//walkspeed\r
        enti->persist_aniframe = enti->q;\r
-       enti->spt=(TILEWH/(enti->speed));       //speed per tile wwww\r
-       enti->pred = enti->d;\r
-       enti->overdraww=0;\r
-       enti->overdrawh=4;\r
+       enti->spt=(TILEWH/(enti->spt)); //speed per tile wwww\r
+       enti->overdraww =       0;\r
+       enti->overdrawh =       4;\r
 \r
        VL_Initofs(video);\r
 \r
 //     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
-       {\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
@@ -60,16 +59,26 @@ void EN_initentity(entity_t *enti, video_t *video)
                for (i=0;i < h;i++,o += video->page[0].stridew,o2 += (w >> 2)) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
                // must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally\r
                vga_restore_rm0wm0();\r
-       }else{\r
-               w=h=o=i=o2=0;\r
-               modexCopyPageRegion(&video->page[2], &video->page[0], enti->x, enti->y, 0, 0, 24, 32);\r
-       }\r
+       }//else{\r
+               //w=h=o=i=o2=0;\r
+               //modexCopyPageRegion(&video->page[2], &video->page[0], enti->x, enti->y, 0, 0, 24, 32);\r
+       //}\r
 }\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
+       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->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
        player[0].info.xaxis = player[0].tx*TILEWH;\r
        player[0].info.y = player[0].ty;\r