Remove warnings from ExplosionSystem.TileFill.cs #34088
Open
+40
−11
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
github-actions
bot
added
S: Untriaged
BarryNorfolk
changed the title
beck-thompson
added
P2: Raised
metalgearsloth
requested changes
Jan 10, 2025
Comment on lines
+92
to
95
| var xform = Transform(referenceGrid.Value); | ||
| spaceMatrix = _transformSystem.GetWorldMatrix(xform); | ||
| spaceAngle = _transformSystem.GetWorldRotation(xform); | ||
| } |
There was a problem hiding this comment.
Use the overload that does both at the same time please, much faster (each one needs to go up the transform hierarchy individually instead of at the same time).
Comment on lines
254
to
+281
|
|
||
| private bool FindInitialTile(MapCoordinates epicenter, out Vector2i initialTile, out EntityUid? epicentreGrid) | ||
| { | ||
| initialTile = new Vector2i(); | ||
| epicentreGrid = null; | ||
|
|
||
| if (!_mapManager.TryFindGridAt(epicenter, out var gridUid, out var candidateGrid)) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| var tilePos = _map.WorldToTile(gridUid, candidateGrid, epicenter.Position); | ||
| if (!_map.TryGetTileRef(gridUid, candidateGrid, tilePos, out var tileRef)) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| if (tileRef.Tile.IsEmpty) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| epicentreGrid = gridUid; | ||
| initialTile = tileRef.GridIndices; | ||
|
|
||
| return true; | ||
| } | ||
|
|
There was a problem hiding this comment.
This looks like it should be an engine method on SharedMapSystem if anything?
Also doesn't TryFindGridAt fail if the tile is empty? is the return at 273 even possible?
Comment on lines
307
to
+310
|
|
||
| foreach (var grid in _mapManager.FindGridsIntersecting(epicenter.MapId, box)) | ||
| var mapGrids = new List<Entity<MapGridComponent>>(); | ||
| _mapManager.FindGridsIntersecting(epicenter.MapId, box, ref mapGrids); | ||
| foreach (var grid in mapGrids) |
There was a problem hiding this comment.
This warning is around the fact you should be storing the list on the system and clearing + re-using it instead of allocating it every time.
metalgearsloth
added
S: Awaiting Changes
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.
About the PR
Removes approx 26 warnings from
Content.Server\Explosion\EntitySystems\ExplosionSystem.TileFill.cs.Looking to help out with #33279
Why / Balance
Warnings are bad. Warnings delenda est.
Technical details
Swapping away from obsolete functions/code to ones.
One instance of breaking up a logic bomb into a separate function that's a tad easier to read.
I've tested in game with a china lake to see if the explosion system still works, which it does. Can provide video if needed.
Media
N/A.
Requirements
Breaking changes
Changelog
N/A