[GEN][ZH] Downgrade debug assertion to log for isPathInDirectory #1128
+2
−2
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.
#1058 added a new check for testing if a file is under a specific base path. In case it was not, a DEBUG_CRASH was triggered, before returning false.
This leads to an assert when starting the shell map, as the code in
GameLogic::startNewGame
explicitly sanity checks that the map is not in the save directory.This type of sanity checking should not cause assertion failures or debug logging, so it's better to move the responsibility for reacting to those cases to the caller. This change removes the DEBUG_CRASH from
FileSystem::isPathInDirectory
, downgrades is to a DEBUG_LOG and places it inGameState::portableMapPathToRealMapPath
.