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

SIO: Fix save state OSD warning formatting #12181

Merged
merged 1 commit into from
Jan 11, 2025

Conversation

TheTechnician27
Copy link
Contributor

@TheTechnician27 TheTechnician27 commented Jan 10, 2025

Description of Changes

Adds a line break in the recently added OSD message that warns you about the use of save states after an hour of not saving. Additionally changes "for quite some time" to "in a long time".

Rationale behind Changes

The line break was used because this message is already so long that it wraps to a second one. The message makes extremely inefficient use of its space, having around 3/5 of an entire row blank. The deliberate line break also makes the second sentence (which would otherwise get cut in half) less awkard to read. Finally, the line break substantially cuts down on the overall horizontal length of the message with no effect on the vertical.

"for quite some time" to "in a long time" because it 1) more heavily emphasizes the length ("quite some time" is very gentle wording; "a long time" is very direct and 'plain English') and 2) cuts down on the length slightly.

Suggested Testing Steps

In order to test this like a sane person, you'll probably want to build it yourself and change the constexpr u32 NUM_FRAMES_BEFORE_SAVESTATE_DEPENDENCY_WARNING in Sio.h from one hour (60 * 60 * 60) to something like one second (60) so you can easily see this. Otherwise, you'll just have to take my word that this is the way it's formatted.

Images

Before:
Before
After:
After

@AmyRoxwell
Copy link

Wait, when did this warning got implemented? That's pretty Good! Gonna be testing this by just leaving the game running on the background while I work on a wiki.

@kamfretoz
Copy link
Contributor

Wait, when did this warning got implemented?

Almost a month ago!

@TheTechnician27
Copy link
Contributor Author

Wait, when did this warning got implemented? That's pretty Good! Gonna be testing this by just leaving the game running on the background while I work on a wiki.

If you want, Amy, you can build from source and just reduce the time to whatever arbitrary amount you want (I describe how to do this in the testing steps). 100% up to you if you want to get the "authentic experience", but no need to necessarily just leave it running for an hour if you just want the message to display. Haha

@AmyRoxwell
Copy link

Wait, when did this warning got implemented? That's pretty Good! Gonna be testing this by just leaving the game running on the background while I work on a wiki.

If you want, Amy, you can build from source and just reduce the time to whatever arbitrary amount you want (I describe how to do this in the testing steps). 100% up to you if you want to get the "authentic experience", but no need to necessarily just leave it running for an hour if you just want the message to display. Haha

Too late, I'm already letting MVC2 run on the background lmao, it's fine!

@AmyRoxwell
Copy link

Alright, waited for an hour, no message showed up.

@TheTechnician27
Copy link
Contributor Author

I will say that the message definitely works, or at least that (if this were a bug) this PR doesn't actually do anything to modify the functionality of the OSD message; it just modifies its contents. Keep in mind that if your memory card is saved at any point during the waiting period, it won't work. Also, it's 216,000 frames (606060), which at 60 FPS is an hour, but I'm not entirely sure if that's VM frames or in-game frames.

@AmyRoxwell
Copy link

AmyRoxwell commented Jan 10, 2025

I will say that the message definitely works, or at least that (if this were a bug) this PR doesn't actually do anything to modify the functionality of the OSD message; it just modifies its contents. Keep in mind that if your memory card is saved at any point during the waiting period, it won't work. Also, it's 216,000 frames (60_60_60), which at 60 FPS is an hour, but I'm not entirely sure if that's VM frames or in-game frames.

Just another hour passed, and it works! probably I didn't wait enough when I make the savestate in that first round but it seems to work correctly on arch linux using the appimage.
image

@F0bes F0bes merged commit 7381a02 into PCSX2:master Jan 11, 2025
12 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.

5 participants