Skip to content

Accommodating the old "jump" action #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tntscreed wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Accommodating the old "jump" action #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/libs/location/src/character.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2410,7 +2410,7 @@ void Character::Update(float dltTime)
isSlide = ptc.isSlide;
if (ptc.isSlide && isEnableJump)
{
if (fall.name && !isFight && !priorityAction.name)
if (jump.name && !isFight && !priorityAction.name)
{
if (TestJump(curPos + CVECTOR(0.001f * sinf(ay), -0.001f, 0.001f * cosf(ay))))
{
Expand All @@ -2420,7 +2420,7 @@ void Character::Update(float dltTime)
jumpSound = SOUND_INVALID_ID;
PlaySound("clothes");
if (fabsf(curPos.y - osculationPoint.y) > 1.5f)
SetPriorityAction(fall.name);
SetPriorityAction(jump.name);
return;
}
}
Expand Down Expand Up @@ -4090,10 +4090,10 @@ void Character::UpdateAnimation()
}
else if (isJump)
{
if (!SetAction(fall.name, fall.tblend, 0.0f, 0.0f))
/*if (!SetAction(fall.name, fall.tblend, 0.0f, 0.0f))
{
core.Trace("Character animation: not fall action: \"%s\"", fall.name);
}
}*/
}
else if (isMove)
{
Expand Down
Loading