diff --git a/src/lara.h b/src/lara.h
index 27af0a6..d2ff2c5 100644
--- a/src/lara.h
+++ b/src/lara.h
@@ -760,9 +760,9 @@ struct Lara : Character {
//int realFrameIndex = int(arms[i].animation.time * 30.0f / anim->frameRate) % ((anim->frameEnd - anim->frameStart) / anim->frameRate + 1);
if (anim.frameIndex != anim.framePrev) {
if (anim.frameIndex == 0) { //realFrameIndex < arms[i].animation.framePrev) {
- if ((input & ACTION) && (!arm.tracking || arm.target)) {
+ if ((input & ACTION) && (!arm.tracking || arm.target))
armShot[i] = true;
- } else
+ else
wpnSetAnim(arm, Weapon::IS_ARMED, Weapon::Anim::AIM, 0.0f, -1.0f, arm.target == NULL);
}
// shotgun reload sound
@@ -783,7 +783,6 @@ struct Lara : Character {
void doShot(bool rightHand, bool leftHand) {
int count = wpnCurrent == Weapon::SHOTGUN ? 6 : 2;
-
float nearDist = 32.0f * 1024.0f;
vec3 nearPos;
int shots = 0;
@@ -860,9 +859,6 @@ struct Lara : Character {
return;
}
- updateTargets();
- updateOverrides();
-
if (wpnNext != Weapon::EMPTY && emptyHands()) {
wpnSet(wpnNext);
wpnDraw();
@@ -1034,12 +1030,18 @@ struct Lara : Character {
}
virtual void lookAt(Controller *target) {
+ updateOverrides();
+
Character::lookAt(canLookAt() ? target : NULL);
- if (wpnCurrent == Weapon::SHOTGUN)
- aimShotgun();
- else
- aimPistols();
+ if (!emptyHands()) {
+ updateTargets();
+
+ if (wpnCurrent == Weapon::SHOTGUN)
+ aimShotgun();
+ else
+ aimPistols();
+ }
}
void aimShotgun() {
@@ -1177,33 +1179,38 @@ struct Lara : Character {
vec3 from = pos - vec3(0, 650, 0);
- for (int i = 0; i < level->entitiesCount; i++) {
- TR::Entity &e = level->entities[i];
- if (!e.flags.active || !e.isEnemy()) continue;
- Character *enemy = (Character*)e.controller;
- if (enemy->health <= 0) continue;
+ Controller *c = Controller::first;
+ while (c) {
+ if (level->entities[c->entity].isEnemy()) {
+ Character *enemy = (Character*)c;
+ if (enemy->health > 0) {
- Box box = enemy->getBoundingBox();
- vec3 p = box.center();
- p.y = box.min.y + (box.max.y - box.min.y) / 3.0f;
+ Box box = enemy->getBoundingBox();
+ vec3 p = box.center();
+ p.y = box.min.y + (box.max.y - box.min.y) / 3.0f;
- vec3 v = p - pos;
- if (dir.dot(v.normal()) <= 0.5f) continue; // target is out of sight -60..+60 degrees
+ vec3 v = p - pos;
+ if (dir.dot(v.normal()) > 0.5f) { // target is on sight -60..+60 degrees
- float d = v.length();
+ float d = v.length();
- if ((d > dist[0] && d > dist[1]) || !checkOcclusion(from, p, d))
- continue;
+ if ((d < dist[0] || d < dist[1]) && checkOcclusion(from, p, d)) {
- if (d < dist[0]) {
- target2 = target1;
- dist[1] = dist[0];
- target1 = enemy;
- dist[0] = d;
- } else if (d < dist[1]) {
- target2 = enemy;
- dist[1] = d;
+ if (d < dist[0]) {
+ target2 = target1;
+ dist[1] = dist[0];
+ target1 = enemy;
+ dist[0] = d;
+ } else if (d < dist[1]) {
+ target2 = enemy;
+ dist[1] = d;
+ }
+ }
+ }
+ }
}
+
+ c = c->next;
}
if (!target2 || dist[1] > dist[0] * 4)
diff --git a/src/platform/web/index.html b/src/platform/web/index.html
index 4c29612..7d71cd7 100644
--- a/src/platform/web/index.html
+++ b/src/platform/web/index.html
@@ -23,7 +23,6 @@
-
@@ -101,6 +100,19 @@
};
};
+
+
+
+
+
+
+ (.PHD, .PSX)
+
+ OpenLara on github & facebook
+
last update: 1.09.2017
+
+
+
-
-
-
-
-
- (.PHD, .PSX)
-
-
- OpenLara on github & facebook
-
-
-
diff --git a/src/platform/web/main.cpp b/src/platform/web/main.cpp
index 8d880db..a7fd40b 100644
--- a/src/platform/web/main.cpp
+++ b/src/platform/web/main.cpp
@@ -17,8 +17,8 @@ extern "C" {
Sound::fill(frames, count);
}
- void EMSCRIPTEN_KEEPALIVE game_level_load(char *data, int size, int home) {
- Game::startLevel(new Stream(data, size), NULL, false, home);
+ void EMSCRIPTEN_KEEPALIVE game_level_load(char *data, int size) {
+ Game::startLevel(new Stream(data, size));
}
}
diff --git a/src/sound.h b/src/sound.h
index f1ed826..778a0a9 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -529,7 +529,7 @@ namespace Sound {
}
// apply volume
vec2 pan = getPan();
- vec2 vol = vec2(1.0f);//pan * volume;
+ vec2 vol = pan * volume;
for (int j = 0; j < i; j++) {
if (volumeDelta != 0.0f) { // increase / decrease channel volume
volume += volumeDelta;