Skip to content

EFH: Several bug fixes#6821

Merged
bluegr merged 3 commits intoscummvm:masterfrom
ellm135:efh-fixes
Jul 19, 2025
Merged

EFH: Several bug fixes#6821
bluegr merged 3 commits intoscummvm:masterfrom
ellm135:efh-fixes

Conversation

@ellm135
Copy link
Contributor

@ellm135 ellm135 commented Jul 18, 2025

Fixes what I think are a few issues that I encountered while working on text-to-speech:

  • The "Give" and "Drop" actions currently only work for equipped items, making dropping or giving unequippable items impossible (which therefore locks the player out of events such as recruiting Hamlet).
  • Trying to close the game when the status menu is open locks the player in the status menu. No player input is recognized at this point, and the game can only be closed by force quitting.
  • When recruiting a new character to replace an existing party member, only 2 can be input, which means that the third party member can't be replaced.

@bluegr
Copy link
Member

bluegr commented Jul 18, 2025

Looks good to me, but let's wait for feedback from @Strangerke as well

@bluegr bluegr requested a review from Strangerke July 18, 2025 06:17
@Strangerke
Copy link
Member

Strangerke commented Jul 18, 2025

I quickly reversed the code related to the first commit, could you test the suggested code I put?

@criezy
Copy link
Member

criezy commented Jul 18, 2025

I quickly reversed the code related to the first commit, could you test the suggested code I put?

I don't see your suggested code anywhere. Did you maybe add it as a review comment and then forgot to submit the review?

Copy link
Member

@Strangerke Strangerke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your pr and for noticing these issues. I added 2 code modifications based on the assembly

@Strangerke
Copy link
Member

Fine for me, thanks again!

@bluegr
Copy link
Member

bluegr commented Jul 19, 2025

Thanks!

@bluegr bluegr merged commit 0cc9a32 into scummvm:master Jul 19, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants