Skip to content
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.

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

Maniac Event command (regression) fixes #3281

Merged
merged 5 commits into from
Oct 16, 2024
Merged

Conversation

Ghabry
Copy link
Member

@Ghabry Ghabry commented Oct 9, 2024

Mostly about Maniac Patch and this one regression found in Yume2kki.

Ghabry added 4 commits October 9, 2024 21:27
…he normal sprite cache.

Fixes a black screen when entering the bedroom in Yume 2kki's Nocturnal Grove (Regression)

Fix EasyRPG#3274
…using Copy From/To without calling Open.

Bug was that the function returned when the lgs file was missing.

Emscripten: Update the filesystem state

Fix EasyRPG#3270
@Ghabry
Copy link
Member Author

Ghabry commented Oct 9, 2024

This currently doesn't fix the GetSaveInfo Async bug due to lack of reproducability on my side.

The rest of the commit is the copilot pull request summary. Wanted to try this feature once. Gotta use some of Microsofts Nuclear power plants.


This pull request includes various improvements and refactorings across multiple files, mainly focusing on enhancing the caching mechanism, improving global save handling, and refining the loading of save games. The most important changes include modifying the caching key structure, improving global save operations, and enhancing the save game loading process.

Improvements to Caching Mechanism:

  • src/cache.cpp: Modified the effect_key_type to include bool for transparency and added an assertion to ensure the bitmap ID is not empty. ([[1]](https://github.com/EasyRPG/Player/pull/3281/files#diff-be9318866236764f4db7ab43183eacf7ab841a7ca4e77e7adf2ac6bb0f8663c4L85-R85), [[2]](https://github.com/EasyRPG/Player/pull/3281/files#diff-be9318866236764f4db7ab43183eacf7ab841a7ca4e77e7adf2ac6bb0f8663c4R468-R477))

Enhancements to Global Save Handling:

  • src/game_interpreter.cpp: Refactored the global save handling logic by introducing a lambda function for loading the global save and ensuring the global save is opened or closed correctly. ([[1]](https://github.com/EasyRPG/Player/pull/3281/files#diff-6201ae4886638abb44984fb7d69b851b9596edd6cd6615c7a7738060150acab8L4524-R4535), [[2]](https://github.com/EasyRPG/Player/pull/3281/files#diff-6201ae4886638abb44984fb7d69b851b9596edd6cd6615c7a7738060150acab8R4596-R4606))
  • src/main_data.cpp, src/main_data.h: Added a global_save_opened flag to track the state of the global save and reset it during cleanup. ([[1]](https://github.com/EasyRPG/Player/pull/3281/files#diff-e00dbe084ef4385c214d8438138633c7201fda3da38f2380d5e8803b77a0f761R74), [[2]](https://github.com/EasyRPG/Player/pull/3281/files#diff-e00dbe084ef4385c214d8438138633c7201fda3da38f2380d5e8803b77a0f761R129-R131), [[3]](https://github.com/EasyRPG/Player/pull/3281/files#diff-24aa28575530ff8ade3582ea243065f3ebf83a5073abfbbe6ceecf37c590a0faR61))

Refinements to Save Game Loading:

  • src/player.cpp: Improved the save game loading process by handling load_on_map within the async callback and ensuring the game map is disposed of correctly before loading the new save. ([[1]](https://github.com/EasyRPG/Player/pull/3281/files#diff-10c39dd978ada90e0d090a045c4ae5f51dad010f3b754679e15894c9b93d254bL1164), [[2]](https://github.com/EasyRPG/Player/pull/3281/files#diff-10c39dd978ada90e0d090a045c4ae5f51dad010f3b754679e15894c9b93d254bL1183-L1194))

Miscellaneous Improvements:

  • src/game_interpreter.cpp: Included the async_handler.h header to support asynchronous operations. ([src/game_interpreter.cppR28](https://github.com/EasyRPG/Player/pull/3281/files#diff-6201ae4886638abb44984fb7d69b851b9596edd6cd6615c7a7738060150acab8R28))
  • src/game_interpreter.cpp: Simplified the logic for handling picture parameters and ensured default transparency settings. ([src/game_interpreter.cppL4060-R4069](https://github.com/EasyRPG/Player/pull/3281/files#diff-6201ae4886638abb44984fb7d69b851b9596edd6cd6615c7a7738060150acab8L4060-R4069))

Before the string contained full paths, breaking the detection logic because most paths are ASCII
@Ghabry
Copy link
Member Author

Ghabry commented Oct 9, 2024

decided to add the "Improved ZIP encoding detection" commit because it is only one line xD

@fdelapena fdelapena added the Awaiting Rebase Pull requests with conflicting files due to former merge label Oct 11, 2024
@Ghabry Ghabry removed the Awaiting Rebase Pull requests with conflicting files due to former merge label Oct 14, 2024
@Ghabry
Copy link
Member Author

Ghabry commented Oct 14, 2024

Tested the commands sqrt etc. as suggested in the chat: The results match for me between EasyRPG and Maniacs. No need to swap them.

@fdelapena fdelapena merged commit 32ebfa5 into EasyRPG:master Oct 16, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

2 participants