mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-16 01:54:38 +02:00
Code Issues Releases Wiki Activity

#3 fix collisions check with enemies

Browse Source
This commit is contained in:
XProger
2017-05-13 16:07:33 +03:00
parent 87b32cdf1a
commit e4fe64d754
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/lara.h
View File

@@ -1171,7 +1171,6 @@ struct Lara : Character {
return false; return false;
int room = getRoomIndex(); int room = getRoomIndex();
TR::Entity &e = getEntity();
TR::Limits::Limit limit = state == STATE_STOP ? TR::Limits::PICKUP : TR::Limits::PICKUP_UNDERWATER; TR::Limits::Limit limit = state == STATE_STOP ? TR::Limits::PICKUP : TR::Limits::PICKUP_UNDERWATER;
for (int i = 0; i < level->entitiesCount; i++) { for (int i = 0; i < level->entitiesCount; i++) {
@@ -1490,8 +1489,6 @@ struct Lara : Character {
} }
Block* getBlock() { Block* getBlock() {
int y = int(pos.y);
for (int i = 0; i < level->entitiesCount; i++) { for (int i = 0; i < level->entitiesCount; i++) {
TR::Entity &e = level->entities[i]; TR::Entity &e = level->entities[i];
if (!e.isBlock()) if (!e.isBlock())
@@ -2004,7 +2001,7 @@ struct Lara : Character {
Character *enemy = (Character*)e.controller; Character *enemy = (Character*)e.controller;
if (enemy->health <= 0) continue; 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); vec3 p = dir.rotateY(-enemy->angle.y);
Box enemyBox = enemy->getBoundingBoxLocal(); Box enemyBox = enemy->getBoundingBoxLocal();