From efc696de09c3dd60e8b0535136b53a7821d845f1 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Wed, 22 Apr 2026 11:08:25 +0300 Subject: [PATCH] Final adjustments --- resources/e/menu/about.png | 4 ++-- resources/e/menu/help.png | 4 ++-- resources/loading.png | 4 ++-- src/Character.cpp | 9 ++++++++- src/Location.cpp | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/resources/e/menu/about.png b/resources/e/menu/about.png index 468c4f5..ca90102 100644 --- a/resources/e/menu/about.png +++ b/resources/e/menu/about.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0227bec93b6f05d913d385a600810e919b1fadc00dfdd3a328885527d9a7fe0e -size 42630 +oid sha256:641c88a147651578d024f5baaba4d0b4c3cc7fef6bc07586d8f3a39e15104e07 +size 42943 diff --git a/resources/e/menu/help.png b/resources/e/menu/help.png index 15f0048..2248a64 100644 --- a/resources/e/menu/help.png +++ b/resources/e/menu/help.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccab4640e7ead9727d34d7c47dc95f68a5a84b47783c27c4ec5e2a34c4d0c0d4 -size 51762 +oid sha256:2860f924a7aa2075ec648d2df99e0830366598e4b026b660c79d53d9df7434b3 +size 67809 diff --git a/resources/loading.png b/resources/loading.png index 3d467ae..c73f3a1 100644 --- a/resources/loading.png +++ b/resources/loading.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4bf28f67eb6bfe976ca3b954bb85b5340721e43c1708f4df857d516a58d5d13 -size 61722 +oid sha256:bd46bef00613c34767108ffba5fab7d46bdd83897bb67ae64293430d2d421d9e +size 61887 diff --git a/src/Character.cpp b/src/Character.cpp index 576597d..4350bf9 100644 --- a/src/Character.cpp +++ b/src/Character.cpp @@ -245,7 +245,14 @@ void Character::update(int64_t deltaMs) { resetAnim = false; anim.currentFrame = 0; } - anim.currentFrame += static_cast(deltaMs) / 24.f; + if (currentState == AnimationState::WALK) + { + anim.currentFrame += static_cast(deltaMs) / 48.f; + } + else + { + anim.currentFrame += static_cast(deltaMs) / 24.f; + } //std::cout << "Current animation frame: " << anim.currentFrame << " / " << anim.totalFrames << " -- " << anim.lastFrame << std::endl; int frms = anim.model.animations[0].keyFrames[anim.model.animations[0].keyFrames.size() - 1].frame; if (static_cast(anim.currentFrame) >= frms) { diff --git a/src/Location.cpp b/src/Location.cpp index 852b12d..4564b81 100644 --- a/src/Location.cpp +++ b/src/Location.cpp @@ -1838,7 +1838,7 @@ void Location::setup() // Cases 1 & 2: phone dialogue done and player has been on foot >15s // (the 60s case from the spec collapses into the same trigger — once // the car is spawned the second threshold is moot). - if (dialoguePlayedPhone1 && !inCar && playerOnFootSeconds > 15.0f) { + if (dialoguePlayedPhone1 && !inCar && playerOnFootSeconds > 23.0f) { shouldSpawn = true; }