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

#58 fix

Browse Source
This commit is contained in:
XProger
2017-07-03 01:12:17 +03:00
parent dd0cd75a97
commit ecd5d18384
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lara.h
View File

@@ -1645,9 +1645,12 @@ struct Lara : Character {
if ((input & (FORTH | WALK)) == (FORTH | WALK)) return STATE_SWAN_DIVE; if ((input & (FORTH | WALK)) == (FORTH | WALK)) return STATE_SWAN_DIVE;
} }
} else } else
if (state != STATE_SWAN_DIVE && state != STATE_REACH && state != STATE_FALL && state != STATE_UP_JUMP && state != STATE_BACK_JUMP && state != STATE_LEFT_JUMP && state != STATE_RIGHT_JUMP) if (state != STATE_SWAN_DIVE && state != STATE_FAST_DIVE && state != STATE_REACH && state != STATE_FALL && state != STATE_UP_JUMP && state != STATE_BACK_JUMP && state != STATE_LEFT_JUMP && state != STATE_RIGHT_JUMP)
return animation.setAnim(ANIM_FALL); return animation.setAnim(ANIM_FALL);
if (state == STATE_SWAN_DIVE)
return STATE_FAST_DIVE;
return state; return state;
} }
@@ -1891,7 +1894,7 @@ struct Lara : Character {
return animation.setAnim(ANIM_WATER_FALL); // TODO: wronng animation return animation.setAnim(ANIM_WATER_FALL); // TODO: wronng animation
} }
if (state == STATE_SWAN_DIVE) { if (state == STATE_SWAN_DIVE || state == STATE_FAST_DIVE) {
angle.x = -PI * 0.5f; angle.x = -PI * 0.5f;
game->waterDrop(pos, 128.0f, 0.2f); game->waterDrop(pos, 128.0f, 0.2f);
Sprite::add(game, TR::Entity::WATER_SPLASH, getRoomIndex(), (int)pos.x, (int)pos.y, (int)pos.z); Sprite::add(game, TR::Entity::WATER_SPLASH, getRoomIndex(), (int)pos.x, (int)pos.y, (int)pos.z);