X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_enti.c;h=bf151be6ddb8724947fd457af22c721800f2071b;hb=4d4c2774d4e51f7356f7a5ef32ef61a9fd2c299a;hp=cc4197965e7f6b4fff1cfefeb166ab4975212051;hpb=e3f94546d96d1227c49fd5c76139bf05f67244ea;p=16.git

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