Skip to content

Repeat mobsi use while action key is held (#857) #1037

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

Closed
kroplabeskidu wants to merge 1 commit into from
Closed

Repeat mobsi use while action key is held (#857) #1037

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
14 changes: 14 additions & 0 deletions common/game/playercontrol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,17 @@ void PlayerControl::tickFocus() {
if(!ctrl[Action::ActionGeneric])
return;

auto w = Gothic::inst().world();
auto pl = w!=nullptr ? w->player() : nullptr;
if(pl!=nullptr && pl->interactive()!=nullptr)
return;

auto focus = currentFocus;
if(focus.interactive!=nullptr && interact(*focus.interactive)) {
clearInput();
// vanilla: holding action key uses mobsi again, after quit
if(pl!=nullptr && pl->interactive()==focus.interactive && !focus.interactive->isLadder())
ctrl[Action::ActionGeneric] = true;
}
else if(focus.npc!=nullptr && interact(*focus.npc)) {
clearInput();
Expand Down Expand Up @@ -966,6 +974,12 @@ void PlayerControl::implMoveMobsi(Npc& pl, uint64_t /*dt*/) {
return;
}

// forward at last state - leave mobsi, same as in vanilla
if(ctrl[KeyCodec::Forward] && !inter->isLadder() && inter->isStaticState() && inter->stateId()==inter->stateCount()) {
pl.setInteraction(nullptr);
return;
}

if(inter->needToLockpick(pl) && !inter->isCracked()) {
return;
}
Expand Down