salmon-engine-projects/shadow-over-bishkek001
14
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing navigation

Browse Source
This commit is contained in:
Vladislav Khorev committed 2026-06-09 12:51:11 +03:00
1 parent dcdeae75bc
commit 77c8471636
29 files changed
+15148 -139
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Character.cpp
+2 -1
View File
@@ -433,7 +433,7 @@ void Character::update(int64_t deltaMs) {
}
else
{
if (prevFrame < 50 && static_cast<int>(anim.currentFrame) >= 50 && (currentState == AnimationState::ACTION_ATTACK || currentState == AnimationState::ACTION_ATTACK_2))
if (prevFrame < 19 && static_cast<int>(anim.currentFrame) >= 19 && (currentState == AnimationState::ACTION_ATTACK || currentState == AnimationState::ACTION_ATTACK_2))
{
if (attackTarget != nullptr)
{
@@ -1220,6 +1220,7 @@ void Character::setupHitSparks(std::shared_ptr<Texture> sparkTexture)
void Character::applyDamage(float damageAmount, const Eigen::Vector3f& attackDirection)
{
std::cout << "Character::applyDamage" << std::endl;
hp = hp - damageAmount;
if (hp < 0) hp = 0;