Cancel roadbuilding with Esc key

[cloudyluna]

Type of change
New feature

Issue(s) closed
Fixes #6284

New behavior
Player now can cancel both road and waterway building with just Esc key for convenience.

Additional context
TODO:

• Implement the requirement mentioned in the linked issue.

[bunnybot]

Mirrored on Codeberg as #CB4818.

[cloudyluna]

Okay, currently while this is working for cancelling road & water building mode, it however breaks the Esc shortcut for opening the in-game main menu. Anyone have any advice on how do I solve this? Sorry, I'm new to the project (and coding tbf).

[bunnybot]

Mirrored from Codeberg
On Sat May 18 22:37:57 CEST 2024, Tóth András (tothxa) wrote:

---

Hi cloudyluna and welcome to Widelands!

Okay, currently while this is working for cancelling road & water building mode, it however breaks the Esc shortcut for opening the in-game main menu. Anyone have any advice on how do I approach to solve this?

Instead of defining a new hotkey, you should check for road/waterway building mode right in the code.sym == SDLK_ESCAPE block in InteractiveGameBase::handle_key(). So you don't even need the new function either.

[cloudyluna]

Thanks for the warm welcome and the pointer! This works! 😄

My previous attempt was unnecessarily complicated, indeed. I've rebased my PR/MR to apply your suggestion. though I probably need to run code formatter on my end before pushing the changes in future. 😅

Also, I don't think there's a need to update in-game documentation docs because it's not a new hotkey addition so I believe we're good here?

[cloudyluna]

I've rebased my commits to a single (the latest) commit and force pushed it here but it seems the old commits still persists for some reason which still keeps breaking the CI. I'm not sure what really is going on here, but let me know if I need to fix anything with git on my end.

[bunnybot]

Mirrored from Codeberg
On Tue May 21 13:56:07 CEST 2024, Tóth András (tothxa) wrote:

---

I've rebased my commits to a single (the latest) commit and force pushed it here but it seems the old commits still persists for some reason which still keeps breaking the CI. I'm not sure what really is going on here, but let me know if I need to fix anything with git on my end.

You have to do the revert in a new commit. Our mirror bot cannot deal with force-pushed updates at all, and they're best avoided both on github and on codeberg in PR branches anyway. PRs are merged in a single ("squashed") commit, so master commit history stays clean even if the PR branch was messy.

[cloudyluna]

You have to do the revert in a new commit. Our mirror bot cannot deal with force-pushed updates at all, and they're best avoided both on github and on codeberg in PR branches anyway. PRs are merged in a single ("squashed") commit, so master commit history stays clean even if the PR branch was messy.

Thanks for the explanation. I've reverted the offending commits and hopefully (finger crossed) the CI will pass this time.

[bunnybot]

Mirrored from Codeberg
On Tue May 21 19:09:42 CEST 2024, Tóth András (tothxa) approved this pull request:

Thank you. Tested and works.

[hessenfarmer]

ci is green, PR is approved so
@bunnybot merge

[bunnybot]

The pull request was merged in the mirrored repo, but the head branch could not be deleted (error code 404).

Please delete the branch manually.

[hessenfarmer]

hi @cloudyluna thanks for your first contribution to this project.
The only open question is how do you like to be credited in our credits?

[cloudyluna]

@hessenfarmer :) hmm I assume by credits you mean the in-game window credits? Using this handle: Luna Cloudberry (cloudyluna) would be fine. and thx.