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

#3 fix aiming after death x_x

Browse Source
This commit is contained in:
XProger
2017-09-30 02:02:40 +03:00
parent c22c4e2e7c
commit 50753cd2ec
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/lara.h
View File

@@ -871,14 +871,6 @@ struct Lara : Character {
void updateWeapon() { void updateWeapon() {
if (level->cutEntity > -1) return; if (level->cutEntity > -1) return;
if (input & DEATH) {
arms[0].shotTimer = arms[1].shotTimer = MUZZLE_FLASH_TIME + 1.0f;
arms[0].tracking = arms[1].tracking = NULL;
arms[0].target = arms[1].target = NULL;
animation.overrideMask = 0;
return;
}
if (wpnNext != Weapon::EMPTY && emptyHands()) { if (wpnNext != Weapon::EMPTY && emptyHands()) {
wpnSet(wpnNext); wpnSet(wpnNext);
wpnDraw(); wpnDraw();
@@ -1050,6 +1042,9 @@ struct Lara : Character {
} }
virtual void lookAt(Controller *target) { virtual void lookAt(Controller *target) {
if (health <= 0.0f)
return;
updateOverrides(); updateOverrides();
Character::lookAt(canLookAt() ? target : NULL); Character::lookAt(canLookAt() ? target : NULL);
@@ -1356,6 +1351,13 @@ struct Lara : Character {
Sound::stop(TR::SND_SCREAM); Sound::stop(TR::SND_SCREAM);
game->stopTrack(); game->stopTrack();
Core::lightColor[1 + 0] = Core::lightColor[1 + 1] = vec4(0, 0, 0, 1);
arms[0].shotTimer = arms[1].shotTimer = MUZZLE_FLASH_TIME + 1.0f;
arms[0].tracking = arms[1].tracking = NULL;
arms[0].target = arms[1].target = NULL;
viewTarget = NULL;
animation.overrideMask = 0;
switch (hitType) { switch (hitType) {
case TR::HIT_FALL : { case TR::HIT_FALL : {
animation.setState(STATE_DEATH); animation.setState(STATE_DEATH);
@@ -1395,8 +1397,6 @@ struct Lara : Character {
} }
default : ; default : ;
} }
Core::lightColor[1 + 0] = Core::lightColor[1 + 1] = vec4(0, 0, 0, 1);
}; };
bool useItem(TR::Entity::Type item) { bool useItem(TR::Entity::Type item) {