You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
bugfix(water): Restore shore waves when loading saved games - #3493
WaterTracksRenderSystem::loadTracks opens the .wak file next to the terrain source file. After a save load the terrain source is the map extracted into the save folder. The save embeds only the .map, so the .wak is not found and the shore waves are missing.
Now loadTracks uses the pristine map name when the terrain source is in the save directory, the same way GameLogic finds the map.ini of a saved map. The original map still has to be installed.
Todo:
Load a GLA mission 3 save: before the fix Save/md_gla03.wak is not found, after the fix Maps/md_gla03/md_gla03.wak is opened
Included review availability: This review used your included allowance. Your plan provides up to 4 included reviews per hour; 0 remain after this review.
Walkthrough
loadTracks now uses the pristine map name to locate the .wak file when the terrain source is in the save directory and TheGameState exists. Otherwise, it continues to use the terrain source filename.
Changes
Water track loading
Layer / File(s)
Summary
Select filename for saved terrain Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
The code includes GameState.h. When the terrain source is in the save directory and TheGameState exists, loadTracks uses the pristine map name to locate the .wak file. Otherwise, it uses the terrain source filename.
Saved-game loads now look for shore-wave data alongside the pristine map. No concrete merge-blocking issue is evident; visual confirmation in game remains outstanding.
Pre-merge checks | 4
✅ Passed checks (4 passed)
Check name
Status
Explanation
Title check
The title clearly and concisely identifies the main change: restoring shore waves when loading saved games.
Description check
The description directly explains the missing .wak file issue, the save-directory condition, the use of the pristine map name, and the expected result.
Linked Issues check
Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check
Check skipped because no linked issues were found for this pull request.
Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
Comment @coderabbitai help to get the list of available commands.
This file contains hidden or 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
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.
WaterTracksRenderSystem::loadTracksopens the.wakfile next to the terrain source file. After a save load the terrain source is the map extracted into the save folder. The save embeds only the.map, so the.wakis not found and the shore waves are missing.Now
loadTracksuses the pristine map name when the terrain source is in the save directory, the same wayGameLogicfinds themap.iniof a saved map. The original map still has to be installed.Todo:
Save/md_gla03.wakis not found, after the fixMaps/md_gla03/md_gla03.wakis opened