mirror
/
anarch
mirror of https://gitlab.com/drummyfish/anarch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Explode at player

This commit is contained in:
Miloslav Číž 2019-10-22 18:20:03 +02:00
parent 3bd2bd05a5
commit d86fae78fc
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
main.c
View File

@ -1713,7 +1713,19 @@ void SFG_gameStep()
} }
} }
if (p->doubleFramesToLive == 0) if (
(p->doubleFramesToLive == 0) ||
SFG_elementCollides(
SFG_player.camera.position.x,
SFG_player.camera.position.y,
SFG_player.camera.height,
p->position[0],
p->position[1],
p->position[2],
0,
0
)
)
{ {
eliminate = 1; eliminate = 1;
} }
@ -1735,14 +1747,14 @@ void SFG_gameStep()
{ {
if ( if (
SFG_elementCollides( SFG_elementCollides(
p->position[0],
p->position[1],
p->position[2],
SFG_MONSTER_COORD_TO_RCL_UNITS(m->coords[0]), SFG_MONSTER_COORD_TO_RCL_UNITS(m->coords[0]),
SFG_MONSTER_COORD_TO_RCL_UNITS(m->coords[1]), SFG_MONSTER_COORD_TO_RCL_UNITS(m->coords[1]),
SFG_floorHeightAt( SFG_floorHeightAt(
SFG_MONSTER_COORD_TO_SQUARES(m->coords[0]), SFG_MONSTER_COORD_TO_SQUARES(m->coords[0]),
SFG_MONSTER_COORD_TO_SQUARES(m->coords[1])), SFG_MONSTER_COORD_TO_SQUARES(m->coords[1])),
p->position[0],
p->position[1],
p->position[2],
0, 0,
0) 0)
) )