Fix #11055: Make saveload failure error messages consistent with others #12247
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2TallTyler
reviewed
Mar 15, 2024
merni-ns
force-pushed
the
fix11055
branch
2 times, most recently
from
e57d345
to
33e4f16
Compare
rubidium42
reviewed
Mar 24, 2024
src/saveload/saveload.cpp
Outdated
| @@ -2803,8 +2802,7 @@ static SaveOrLoadResult SaveFileToDisk(bool threaded) | |||
| /* We don't want to shout when saving is just | |||
| * cancelled due to a client disconnecting. */ | |||
| if (_sl.error_str != STR_NETWORK_ERROR_LOSTCONNECTION) { | |||
| /* Skip the "colour" character */ | |||
| Debug(sl, 0, "{}", GetSaveLoadErrorString() + 3); | |||
| Debug(sl, 0, "{}", GetString(GetSaveLoadErrorType())); | |||
There was a problem hiding this comment.
Why is the colour not stripped any more? Also in the next bit. For example using .substr(3).
There was a problem hiding this comment.
Hopefully I have fixed it in the current force-push, but I have no idea about how colour codes work.
merni-ns
force-pushed
the
fix11055
branch
3 times, most recently
from
ae379c5
to
ece4b1f
Compare
…th others The save/load error messages were combined using string parameters, rather than using the built-in functionality of error dialogs.
rubidium42
approved these changes
Apr 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation / Problem
Fixes #11055.
The "save/load failed" error messages were displayed by substituting the reason (
_sl.error_str) with a parameter intoSTR_ERROR_GAME_SAVE_FAILED/STR_ERROR_GAME_LOAD_FAILED. This means the line separation is not the same as those formed by using the two parameters ofShowErrorMessage.Description
ShowErrorMessageto show the initial string "Game save failed"/"Game load failed"STR_ERROR_GAME_(SAVE|LOAD)_FAILED._sl.extra_msg, an untranslated string returned by internal APIs, is untouched and used as the first parameter of reasons that require it (and thus the first parameter overall).Limitations
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.