Final adjustments

This commit is contained in:
Vladislav Khorev committed 2026-04-22 11:08:25 +03:00
1 parent 074c586edf
commit efc696de09
5 files changed
+14 -7

No files matched your search

Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
+7
View File
@@ -245,7 +245,14 @@ void Character::update(int64_t deltaMs) {
resetAnim = false; resetAnim = false;
anim.currentFrame = 0; anim.currentFrame = 0;
} }
if (currentState == AnimationState::WALK)
{
anim.currentFrame += static_cast<float>(deltaMs) / 48.f;
}
else
{
anim.currentFrame += static_cast<float>(deltaMs) / 24.f; anim.currentFrame += static_cast<float>(deltaMs) / 24.f;
}
//std::cout << "Current animation frame: " << anim.currentFrame << " / " << anim.totalFrames << " -- " << anim.lastFrame << std::endl; //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; int frms = anim.model.animations[0].keyFrames[anim.model.animations[0].keyFrames.size() - 1].frame;
if (static_cast<int>(anim.currentFrame) >= frms) { if (static_cast<int>(anim.currentFrame) >= frms) {
+1 -1
View File
@@ -1838,7 +1838,7 @@ void Location::setup()
// Cases 1 & 2: phone dialogue done and player has been on foot >15s // 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 60s case from the spec collapses into the same trigger — once
// the car is spawned the second threshold is moot). // the car is spawned the second threshold is moot).
if (dialoguePlayedPhone1 && !inCar && playerOnFootSeconds > 15.0f) { if (dialoguePlayedPhone1 && !inCar && playerOnFootSeconds > 23.0f) {
shouldSpawn = true; shouldSpawn = true;
} }