Part of a small fix on GlobalVariables #1247
Open
+107
−2
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
FS-21
reviewed
May 18, 2024
| @@ -301,6 +301,7 @@ This page lists all the individual contributions to the project by their author. | |||
| - **FlyStar** | |||
| - Campaign load screen PCX support | |||
| - New condition for automatic self-destruction logic when TechnoTypes exist/don't exist | |||
| - GlobalVariable Passing fix, AltNextScenario fix | |||
There was a problem hiding this comment.
2 different/unrelated fixes, in 2 lines, not in the same line.
Comment on lines
+61
to
+64
| if (bIsGlobal) | ||
| { | ||
| ScenarioExt::Global()->LoadVariablesToFile(true); | ||
| } |
There was a problem hiding this comment.
Suggested change
| if (bIsGlobal) | |
| { | |
| ScenarioExt::Global()->LoadVariablesToFile(true); | |
| } | |
| if (bIsGlobal) | |
| ScenarioExt::Global()->LoadVariablesToFile(true); |
Comment on lines
+116
to
+120
| if (!Phobos::Config::SaveVariablesOnScenarioEnd) | ||
| { | ||
| // Is it better not to delete the file? | ||
| DeleteFileA(fileName); | ||
| } |
There was a problem hiding this comment.
Suggested change
| if (!Phobos::Config::SaveVariablesOnScenarioEnd) | |
| { | |
| // Is it better not to delete the file? | |
| DeleteFileA(fileName); | |
| } | |
| if (!Phobos::Config::SaveVariablesOnScenarioEnd) | |
| DeleteFileA(fileName); // Is it better not to delete the file? |
Comment on lines
+97
to
+99
| ScenarioExt::Global()->LoadVariablesToFile(true); | ||
|
|
||
| return 0x4C622F; |
There was a problem hiding this comment.
Suggested change
| ScenarioExt::Global()->LoadVariablesToFile(true); | |
| return 0x4C622F; | |
| ScenarioExt::Global()->LoadVariablesToFile(true); | |
| return 0x4C622F; |
Comment on lines
+140
to
+143
| if (strcmp(ScenarioClass::Instance->NextScenario, "")) | ||
| { | ||
| return NextScenario; | ||
| } |
There was a problem hiding this comment.
Suggested change
| if (strcmp(ScenarioClass::Instance->NextScenario, "")) | |
| { | |
| return NextScenario; | |
| } | |
| if (strcmp(ScenarioClass::Instance->NextScenario, "")) | |
| return NextScenario; |
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.
Previously while using phobos I noticed that the game was passing GlobalVariables with an error. due to a technical glitch I couldn't get to the root of the problem so I opted for an alternative method of exporting globals.ini and re-reading the parameters.
PS: There may be a better way, but that's not something I can do anymore.