From e4fe64d75475b98e7510e30fecc4af3f49a32946 Mon Sep 17 00:00:00 2001 From: XProger Date: Sat, 13 May 2017 16:07:33 +0300 Subject: [PATCH] #3 fix collisions check with enemies --- src/lara.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lara.h b/src/lara.h index e39a908..62c4e9f 100644 --- a/src/lara.h +++ b/src/lara.h @@ -1171,7 +1171,6 @@ struct Lara : Character { return false; int room = getRoomIndex(); - TR::Entity &e = getEntity(); TR::Limits::Limit limit = state == STATE_STOP ? TR::Limits::PICKUP : TR::Limits::PICKUP_UNDERWATER; for (int i = 0; i < level->entitiesCount; i++) { @@ -1490,8 +1489,6 @@ struct Lara : Character { } Block* getBlock() { - int y = int(pos.y); - for (int i = 0; i < level->entitiesCount; i++) { TR::Entity &e = level->entities[i]; if (!e.isBlock()) @@ -2004,7 +2001,7 @@ struct Lara : Character { Character *enemy = (Character*)e.controller; if (enemy->health <= 0) continue; - vec3 dir = pos - enemy->pos; + vec3 dir = pos - vec3(0.0f, 128.0f, 0.0f) - enemy->pos; vec3 p = dir.rotateY(-enemy->angle.y); Box enemyBox = enemy->getBoundingBoxLocal();