vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(4ca668169) Fixed: Conflict

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-05-16 05:58:48 +03:00
parent 0a67590572
commit cb83984e80
80 changed files with 2036 additions and 1859 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Map/Levels/Level.cs
+12 -8
View File
@@ -25,17 +25,21 @@ namespace Barotrauma
var allLevelObjects = levelObjectManager.GetAllObjects();
foreach (var levelObj in allLevelObjects)
{
if (levelObj.Prefab.Sprite != null &&
!uniqueTextures.Contains(levelObj.Prefab.Sprite.Texture))
foreach (Sprite sprite in levelObj.Prefab.Sprites)
{
uniqueTextures.Add(levelObj.Prefab.Sprite.Texture);
uniqueSprites.Add(levelObj.Prefab.Sprite);
if (!uniqueTextures.Contains(sprite.Texture))
{
uniqueTextures.Add(sprite.Texture);
uniqueSprites.Add(sprite);
}
}
if (levelObj.Prefab.SpecularSprite != null &&
!uniqueTextures.Contains(levelObj.Prefab.SpecularSprite.Texture))
foreach (Sprite specularSprite in levelObj.Prefab.SpecularSprites)
{
uniqueTextures.Add(levelObj.Prefab.SpecularSprite.Texture);
uniqueSprites.Add(levelObj.Prefab.SpecularSprite);
if (!uniqueTextures.Contains(specularSprite.Texture))
{
uniqueTextures.Add(specularSprite.Texture);
uniqueSprites.Add(specularSprite);
}
}
}