Skip to content

Fix LandBrush Manager crash on missing texmaps; fall back to land art #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thefrsx wants to merge 1 commit into from
Closed

Fix LandBrush Manager crash on missing texmaps; fall back to land art #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions CentrED/UI/Windows/LandBrushManagerWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,12 @@ public void DrawPreview(string name, Vector2 size)
private void DrawTile(int id, Vector2 size)
{
var spriteInfo = CEDGame.MapManager.Texmaps.GetTexmap(CEDGame.MapManager.UoFileManager.TileData.LandData[id].TexID);
if (spriteInfo.Texture == null)
{
//Fallback to flat land art when texmaps are absent in this shard's art set
var isArtValid = CEDGame.MapManager.UoFileManager.Arts.File.GetValidRefEntry(id).Length > 0;
spriteInfo = CEDGame.MapManager.Arts.GetLand(isArtValid ? (uint)id : 0);
}
if (spriteInfo.Texture != null)
{
CEDGame.UIManager.DrawImage(spriteInfo.Texture, spriteInfo.UV, size, true);
Expand Down Expand Up @@ -327,10 +333,16 @@ private unsafe void ToggleDirButton(LandBrushTransition transition, Direction di
var spriteInfo = CEDGame.MapManager.Texmaps.GetTexmap(CEDGame.MapManager.UoFileManager.TileData.LandData[tileId].TexID);
if (spriteInfo.Texture == null)
{
//Fallback to VOID
spriteInfo = CEDGame.MapManager.Texmaps.GetTexmap(0x0001);
//Fallback to flat land art when texmaps are absent in this shard's art set
var isArtValid = CEDGame.MapManager.UoFileManager.Arts.File.GetValidRefEntry(tileId).Length > 0;
spriteInfo = CEDGame.MapManager.Arts.GetLand(isArtValid ? (uint)tileId : 0);
}
var tex = spriteInfo.Texture;
if (tex == null)
{
//No art available either - avoid NRE crash
return (default, Vector2.Zero, Vector2.Zero);
}
var bounds = spriteInfo.UV;
var texPtr = CEDGame.UIManager._uiRenderer.BindTexture(tex);
var fWidth = (float)tex.Width;
Expand Down