diff --git a/Subsurface/Source/Characters/AI/HumanAIController.cs b/Subsurface/Source/Characters/AI/HumanAIController.cs index ef9cea153..fe14ee52d 100644 --- a/Subsurface/Source/Characters/AI/HumanAIController.cs +++ b/Subsurface/Source/Characters/AI/HumanAIController.cs @@ -39,7 +39,7 @@ namespace Barotrauma if (GameMain.GameSession!=null && GameMain.GameSession.CrewManager!=null) { - CurrentOrder = Order.PrefabList.Find(o => o.Name.ToLower() == "dismissed"); + CurrentOrder = Order.PrefabList.Find(o => o.Name.ToLowerInvariant() == "dismissed"); objectiveManager.SetOrder(CurrentOrder, ""); GameMain.GameSession.CrewManager.SetCharacterOrder(Character, CurrentOrder); } diff --git a/Subsurface/Source/Characters/AI/Objectives/AIObjectiveManager.cs b/Subsurface/Source/Characters/AI/Objectives/AIObjectiveManager.cs index 04cb4c11b..1a6b91b45 100644 --- a/Subsurface/Source/Characters/AI/Objectives/AIObjectiveManager.cs +++ b/Subsurface/Source/Characters/AI/Objectives/AIObjectiveManager.cs @@ -71,7 +71,7 @@ namespace Barotrauma currentObjective = null; - switch (order.Name.ToLower()) + switch (order.Name.ToLowerInvariant()) { case "follow": currentObjective = new AIObjectiveGoTo(Character.Controlled, character, true); diff --git a/Subsurface/Source/Characters/AI/Order.cs b/Subsurface/Source/Characters/AI/Order.cs index be888bbb2..f8b9bab3f 100644 --- a/Subsurface/Source/Characters/AI/Order.cs +++ b/Subsurface/Source/Characters/AI/Order.cs @@ -39,7 +39,7 @@ namespace Barotrauma foreach (XElement orderElement in doc.Root.Elements()) { - if (orderElement.Name.ToString().ToLower() != "order") continue; + if (orderElement.Name.ToString().ToLowerInvariant() != "order") continue; PrefabList.Add(new Order(orderElement)); } @@ -100,7 +100,7 @@ namespace Barotrauma foreach (XElement subElement in orderElement.Elements()) { - if (subElement.Name.ToString().ToLower() != "sprite") continue; + if (subElement.Name.ToString().ToLowerInvariant() != "sprite") continue; SymbolSprite = new Sprite(subElement); break; } diff --git a/Subsurface/Source/Characters/Attack.cs b/Subsurface/Source/Characters/Attack.cs index 5ed3af6b0..9d26273be 100644 --- a/Subsurface/Source/Characters/Attack.cs +++ b/Subsurface/Source/Characters/Attack.cs @@ -121,7 +121,8 @@ namespace Barotrauma foreach (XElement subElement in element.Elements()) { - if (subElement.Name.ToString().ToLower() == "particleemitter") particleEmitterPrefab = new ParticleEmitterPrefab(subElement); + if (subElement.Name.ToString().ToLowerInvariant() != "particleemitter") continue; + particleEmitterPrefab = new ParticleEmitterPrefab(subElement); } } diff --git a/Subsurface/Source/Characters/BackgroundSprite/BackgroundCreaturePrefab.cs b/Subsurface/Source/Characters/BackgroundSprite/BackgroundCreaturePrefab.cs index 6dd2dad53..b0e22914f 100644 --- a/Subsurface/Source/Characters/BackgroundSprite/BackgroundCreaturePrefab.cs +++ b/Subsurface/Source/Characters/BackgroundSprite/BackgroundCreaturePrefab.cs @@ -36,7 +36,7 @@ namespace Barotrauma foreach (XElement subElement in element.Elements()) { - if (subElement.Name.ToString().ToLower() != "sprite") continue; + if (subElement.Name.ToString().ToLowerInvariant() != "sprite") continue; Sprite = new Sprite(subElement); break; diff --git a/Subsurface/Source/Characters/BackgroundSprite/BackgroundSpritePrefab.cs b/Subsurface/Source/Characters/BackgroundSprite/BackgroundSpritePrefab.cs index 8fe9c8021..c6c3b7ffd 100644 --- a/Subsurface/Source/Characters/BackgroundSprite/BackgroundSpritePrefab.cs +++ b/Subsurface/Source/Characters/BackgroundSprite/BackgroundSpritePrefab.cs @@ -37,7 +37,7 @@ namespace Barotrauma foreach (XElement subElement in element.Elements()) { - if (subElement.Name.ToString().ToLower() != "sprite") continue; + if (subElement.Name.ToString().ToLowerInvariant() != "sprite") continue; Sprite = new Sprite(subElement); break; diff --git a/Subsurface/Source/Characters/CharacterInfo.cs b/Subsurface/Source/Characters/CharacterInfo.cs index cc13ef6d8..00d975eea 100644 --- a/Subsurface/Source/Characters/CharacterInfo.cs +++ b/Subsurface/Source/Characters/CharacterInfo.cs @@ -163,7 +163,7 @@ namespace Barotrauma XElement ragdollElement = doc.Root.Element("ragdoll"); foreach (XElement limbElement in ragdollElement.Elements()) { - if (ToolBox.GetAttributeString(limbElement, "type", "").ToLower() != "head") continue; + if (ToolBox.GetAttributeString(limbElement, "type", "").ToLowerInvariant() != "head") continue; XElement spriteElement = limbElement.Element("sprite"); @@ -255,7 +255,7 @@ namespace Barotrauma { Name = ToolBox.GetAttributeString(element, "name", "unnamed"); - string genderStr = ToolBox.GetAttributeString(element, "gender", "male").ToLower(); + string genderStr = ToolBox.GetAttributeString(element, "gender", "male").ToLowerInvariant(); gender = (genderStr == "m") ? Gender.Male : Gender.Female; File = ToolBox.GetAttributeString(element, "file", ""); @@ -277,7 +277,7 @@ namespace Barotrauma foreach (XElement subElement in element.Elements()) { - if (subElement.Name.ToString().ToLower() != "job") continue; + if (subElement.Name.ToString().ToLowerInvariant() != "job") continue; Job = new Job(subElement); break; diff --git a/Subsurface/Source/Characters/Jobs/Job.cs b/Subsurface/Source/Characters/Jobs/Job.cs index d15453aa0..d777bae65 100644 --- a/Subsurface/Source/Characters/Jobs/Job.cs +++ b/Subsurface/Source/Characters/Jobs/Job.cs @@ -54,13 +54,13 @@ namespace Barotrauma public Job(XElement element) { - string name = ToolBox.GetAttributeString(element, "name", "").ToLower(); - prefab = JobPrefab.List.Find(jp => jp.Name.ToLower() == name); + string name = ToolBox.GetAttributeString(element, "name", "").ToLowerInvariant(); + prefab = JobPrefab.List.Find(jp => jp.Name.ToLowerInvariant() == name); skills = new Dictionary(); foreach (XElement subElement in element.Elements()) { - if (subElement.Name.ToString().ToLower() != "skill") continue; + if (subElement.Name.ToString().ToLowerInvariant() != "skill") continue; string skillName = ToolBox.GetAttributeString(subElement, "name", ""); if (string.IsNullOrEmpty(name)) continue; skills.Add( @@ -86,6 +86,8 @@ namespace Barotrauma public void GiveJobItems(Character character, WayPoint spawnPoint) { + if (SpawnItems == null) return; + foreach (XElement itemElement in SpawnItems.Elements()) { InitializeJobItem(character, spawnPoint, itemElement); diff --git a/Subsurface/Source/Characters/Jobs/JobPrefab.cs b/Subsurface/Source/Characters/Jobs/JobPrefab.cs index 426a1e3b4..62fd6bbac 100644 --- a/Subsurface/Source/Characters/Jobs/JobPrefab.cs +++ b/Subsurface/Source/Characters/Jobs/JobPrefab.cs @@ -77,7 +77,7 @@ namespace Barotrauma foreach (XElement subElement in element.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "items": Items = subElement; diff --git a/Subsurface/Source/Characters/Limb.cs b/Subsurface/Source/Characters/Limb.cs index 37ec28622..3198bb8f6 100644 --- a/Subsurface/Source/Characters/Limb.cs +++ b/Subsurface/Source/Characters/Limb.cs @@ -265,7 +265,7 @@ namespace Barotrauma foreach (XElement subElement in element.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "sprite": string spritePath = subElement.Attribute("texture").Value; diff --git a/Subsurface/Source/Characters/StatusEffect.cs b/Subsurface/Source/Characters/StatusEffect.cs index 3da1ab535..273db9420 100644 --- a/Subsurface/Source/Characters/StatusEffect.cs +++ b/Subsurface/Source/Characters/StatusEffect.cs @@ -137,14 +137,14 @@ namespace Barotrauma int n = 0; foreach (XAttribute attribute in propertyAttributes) { - propertyNames[n] = attribute.Name.ToString().ToLower(); + propertyNames[n] = attribute.Name.ToString().ToLowerInvariant(); propertyEffects[n] = ToolBox.GetAttributeObject(attribute); n++; } foreach (XElement subElement in element.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "explosion": explosion = new Explosion(subElement); diff --git a/Subsurface/Source/DebugConsole.cs b/Subsurface/Source/DebugConsole.cs index d5ce32bc7..7d8970caf 100644 --- a/Subsurface/Source/DebugConsole.cs +++ b/Subsurface/Source/DebugConsole.cs @@ -146,7 +146,7 @@ namespace Barotrauma if (command == "") return; string[] commands = command.Split(' '); - switch (commands[0].ToLower()) + switch (commands[0].ToLowerInvariant()) { case "help": NewMessage("menu: go to main menu", Color.Cyan); @@ -203,7 +203,7 @@ namespace Barotrauma if (commands.Length > 2) { - switch (commands[2].ToLower()) + switch (commands[2].ToLowerInvariant()) { case "inside": spawnPoint = WayPoint.GetRandom(SpawnType.Human); @@ -233,19 +233,19 @@ namespace Barotrauma } break; default: - spawnPoint = WayPoint.GetRandom(commands[1].ToLower()=="human" ? SpawnType.Human : SpawnType.Enemy); + spawnPoint = WayPoint.GetRandom(commands[1].ToLowerInvariant()=="human" ? SpawnType.Human : SpawnType.Enemy); break; } } else { - spawnPoint = WayPoint.GetRandom(commands[1].ToLower() == "human" ? SpawnType.Human : SpawnType.Enemy); + spawnPoint = WayPoint.GetRandom(commands[1].ToLowerInvariant() == "human" ? SpawnType.Human : SpawnType.Enemy); } spawnPosition = spawnPoint == null ? Vector2.Zero : spawnPoint.WorldPosition; - if (commands[1].ToLower()=="human") + if (commands[1].ToLowerInvariant()=="human") { spawnedCharacter = Character.Create(Character.HumanConfigFile, spawnPosition); Character.Controlled = spawnedCharacter; @@ -315,8 +315,8 @@ namespace Barotrauma case "controlcharacter": case "control": if (commands.Length < 2) break; - commands[1] = commands[1].ToLower(); - Character.Controlled = Character.CharacterList.Find(c => !c.IsNetworkPlayer && c.Name.ToLower() == commands[1]); + commands[1] = commands[1].ToLowerInvariant(); + Character.Controlled = Character.CharacterList.Find(c => !c.IsNetworkPlayer && c.Name.ToLowerInvariant() == commands[1]); break; case "godmode": Submarine.Loaded.GodMode = !Submarine.Loaded.GodMode; diff --git a/Subsurface/Source/Events/Missions/Mission.cs b/Subsurface/Source/Events/Missions/Mission.cs index de10a9780..4f9d12ffb 100644 --- a/Subsurface/Source/Events/Missions/Mission.cs +++ b/Subsurface/Source/Events/Missions/Mission.cs @@ -9,7 +9,7 @@ namespace Barotrauma { class Mission { - private static List list = new List(); + //private static List list = new List(); private string name; @@ -86,7 +86,7 @@ namespace Barotrauma headers = new List(); foreach (XElement subElement in element.Elements()) { - if (subElement.Name.ToString().ToLower() != "message") continue; + if (subElement.Name.ToString().ToLowerInvariant() != "message") continue; headers.Add(ToolBox.GetAttributeString(subElement, "header", "")); messages.Add(ToolBox.GetAttributeString(subElement, "text", "")); } diff --git a/Subsurface/Source/GUI/ComponentStyle.cs b/Subsurface/Source/GUI/ComponentStyle.cs index 4f6a73b1a..d336cb812 100644 --- a/Subsurface/Source/GUI/ComponentStyle.cs +++ b/Subsurface/Source/GUI/ComponentStyle.cs @@ -73,7 +73,7 @@ namespace Barotrauma foreach (XElement subElement in element.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "sprite": Sprite sprite = new Sprite(subElement); diff --git a/Subsurface/Source/GUI/GUIStyle.cs b/Subsurface/Source/GUI/GUIStyle.cs index 1a9878454..bc810d82d 100644 --- a/Subsurface/Source/GUI/GUIStyle.cs +++ b/Subsurface/Source/GUI/GUIStyle.cs @@ -24,14 +24,14 @@ namespace Barotrauma foreach (XElement subElement in doc.Root.Elements()) { GUIComponentStyle componentStyle = new GUIComponentStyle(subElement); - componentStyles.Add(subElement.Name.ToString().ToLower(), componentStyle); + componentStyles.Add(subElement.Name.ToString().ToLowerInvariant(), componentStyle); } } public void Apply(GUIComponent targetComponent, GUIComponent parent = null) { GUIComponentStyle componentStyle = null; - string name = (parent==null) ? targetComponent.GetType().Name.ToLower() : parent.GetType().Name.ToLower(); + string name = (parent == null) ? targetComponent.GetType().Name.ToLowerInvariant() : parent.GetType().Name.ToLowerInvariant(); componentStyles.TryGetValue(name, out componentStyle); if (componentStyle==null) diff --git a/Subsurface/Source/GameSession/CrewManager.cs b/Subsurface/Source/GameSession/CrewManager.cs index 2c613449c..35261dd84 100644 --- a/Subsurface/Source/GameSession/CrewManager.cs +++ b/Subsurface/Source/GameSession/CrewManager.cs @@ -57,7 +57,7 @@ namespace Barotrauma foreach (XElement subElement in element.Elements()) { - if (subElement.Name.ToString().ToLower()!="character") continue; + if (subElement.Name.ToString().ToLowerInvariant() != "character") continue; characterInfos.Add(new CharacterInfo(subElement)); } diff --git a/Subsurface/Source/GameSession/GameModes/SinglePlayerMode.cs b/Subsurface/Source/GameSession/GameModes/SinglePlayerMode.cs index 0dec54830..3c57abf41 100644 --- a/Subsurface/Source/GameSession/GameModes/SinglePlayerMode.cs +++ b/Subsurface/Source/GameSession/GameModes/SinglePlayerMode.cs @@ -89,7 +89,7 @@ namespace Barotrauma foreach (XElement subElement in element.Elements()) { - if (subElement.Name.ToString().ToLower() != "crew") continue; + if (subElement.Name.ToString().ToLowerInvariant() != "crew") continue; GameMain.GameSession.CrewManager = new CrewManager(subElement); } diff --git a/Subsurface/Source/GameSession/GameModes/Tutorials/TutorialType.cs b/Subsurface/Source/GameSession/GameModes/Tutorials/TutorialType.cs index 76ce124a6..36af62a21 100644 --- a/Subsurface/Source/GameSession/GameModes/Tutorials/TutorialType.cs +++ b/Subsurface/Source/GameSession/GameModes/Tutorials/TutorialType.cs @@ -36,7 +36,7 @@ namespace Barotrauma.Tutorials public virtual void Initialize() { - GameMain.GameSession = new GameSession(Submarine.Loaded, "", GameModePreset.list.Find(gm => gm.Name.ToLower() == "tutorial")); + GameMain.GameSession = new GameSession(Submarine.Loaded, "", GameModePreset.list.Find(gm => gm.Name.ToLowerInvariant() == "tutorial")); (GameMain.GameSession.gameMode as TutorialMode).tutorialType = this; GameMain.GameSession.StartShift("tuto1"); @@ -58,7 +58,7 @@ namespace Barotrauma.Tutorials CharacterInfo charInfo = new CharacterInfo(Character.HumanConfigFile, "", Gender.None, JobPrefab.List.Find(jp => jp.Name == "Engineer")); - character = Character.Create(charInfo, wayPoint.WorldPosition); + character = Character.Create(charInfo, wayPoint.WorldPosition, false, false); Character.Controlled = character; character.GiveJobItems(null); diff --git a/Subsurface/Source/GameSession/GameSession.cs b/Subsurface/Source/GameSession/GameSession.cs index 8a8e40cef..8f0168bdb 100644 --- a/Subsurface/Source/GameSession/GameSession.cs +++ b/Subsurface/Source/GameSession/GameSession.cs @@ -96,7 +96,7 @@ namespace Barotrauma foreach (XElement subElement in doc.Root.Elements()) { - if (subElement.Name.ToString().ToLower() != "gamemode") continue; + if (subElement.Name.ToString().ToLowerInvariant() != "gamemode") continue; gameMode = new SinglePlayerMode(subElement); } diff --git a/Subsurface/Source/GameSession/InfoTextManager.cs b/Subsurface/Source/GameSession/InfoTextManager.cs index 38aceb7fb..3e28cfc0a 100644 --- a/Subsurface/Source/GameSession/InfoTextManager.cs +++ b/Subsurface/Source/GameSession/InfoTextManager.cs @@ -25,7 +25,7 @@ namespace Barotrauma foreach (XElement subElement in doc.Root.Elements()) { - string infoName = subElement.Name.ToString().ToLower(); + string infoName = subElement.Name.ToString().ToLowerInvariant(); List infoList = null; if (!infoTexts.TryGetValue(infoName, out infoList)) { @@ -40,7 +40,7 @@ namespace Barotrauma public static string GetInfoText(string infoName) { List infoList = null; - if (!infoTexts.TryGetValue(infoName.ToLower(), out infoList) || !infoList.Any()) + if (!infoTexts.TryGetValue(infoName.ToLowerInvariant(), out infoList) || !infoList.Any()) { #if DEBUG return "Info text ''" + infoName + "'' not found"; diff --git a/Subsurface/Source/GameSettings.cs b/Subsurface/Source/GameSettings.cs index afd8776a4..6417e200e 100644 --- a/Subsurface/Source/GameSettings.cs +++ b/Subsurface/Source/GameSettings.cs @@ -171,7 +171,7 @@ namespace Barotrauma foreach (XElement subElement in doc.Root.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "contentpackage": string path = ToolBox.GetAttributeString(subElement, "path", ""); diff --git a/Subsurface/Source/Items/Components/Door.cs b/Subsurface/Source/Items/Components/Door.cs index 4c1dbffbb..e130dd930 100644 --- a/Subsurface/Source/Items/Components/Door.cs +++ b/Subsurface/Source/Items/Components/Door.cs @@ -127,7 +127,7 @@ namespace Barotrauma.Items.Components // isOpen = false; foreach (XElement subElement in element.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "sprite": doorSprite = new Sprite(subElement, Path.GetDirectoryName(item.Prefab.ConfigFile)); diff --git a/Subsurface/Source/Items/Components/Holdable/MeleeWeapon.cs b/Subsurface/Source/Items/Components/Holdable/MeleeWeapon.cs index d1ce2039e..bc56a8bb3 100644 --- a/Subsurface/Source/Items/Components/Holdable/MeleeWeapon.cs +++ b/Subsurface/Source/Items/Components/Holdable/MeleeWeapon.cs @@ -44,7 +44,7 @@ namespace Barotrauma.Items.Components foreach (XElement subElement in element.Elements()) { - if (subElement.Name.ToString().ToLower() != "attack") continue; + if (subElement.Name.ToString().ToLowerInvariant() != "attack") continue; attack = new Attack(subElement); } } diff --git a/Subsurface/Source/Items/Components/Holdable/Pickable.cs b/Subsurface/Source/Items/Components/Holdable/Pickable.cs index 274fe8d92..f45ee1d9a 100644 --- a/Subsurface/Source/Items/Components/Holdable/Pickable.cs +++ b/Subsurface/Source/Items/Components/Holdable/Pickable.cs @@ -39,7 +39,7 @@ namespace Barotrauma.Items.Components InvSlotType allowedSlot = InvSlotType.None; foreach (string slot in slots) { - if (slot.ToLower()=="bothhands") + if (slot.ToLowerInvariant() == "bothhands") { allowedSlot = InvSlotType.LeftHand | InvSlotType.RightHand; } diff --git a/Subsurface/Source/Items/Components/Holdable/Propulsion.cs b/Subsurface/Source/Items/Components/Holdable/Propulsion.cs index a19dba2ef..845ecdbf1 100644 --- a/Subsurface/Source/Items/Components/Holdable/Propulsion.cs +++ b/Subsurface/Source/Items/Components/Holdable/Propulsion.cs @@ -30,7 +30,7 @@ namespace Barotrauma.Items.Components public Propulsion(Item item, XElement element) : base(item,element) { - switch (ToolBox.GetAttributeString(element, "usablein", "air").ToLower()) + switch (ToolBox.GetAttributeString(element, "usablein", "air").ToLowerInvariant()) { case "air": usableIn = ParticlePrefab.DrawTargetType.Air; diff --git a/Subsurface/Source/Items/Components/Holdable/RepairTool.cs b/Subsurface/Source/Items/Components/Holdable/RepairTool.cs index 2402a3ff2..4dd1cc0c6 100644 --- a/Subsurface/Source/Items/Components/Holdable/RepairTool.cs +++ b/Subsurface/Source/Items/Components/Holdable/RepairTool.cs @@ -83,7 +83,7 @@ namespace Barotrauma.Items.Components fixableEntities = new List(); foreach (XElement subElement in element.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "fixable": fixableEntities.Add(subElement.Attribute("name").Value); diff --git a/Subsurface/Source/Items/Components/ItemComponent.cs b/Subsurface/Source/Items/Components/ItemComponent.cs index fdf50d5bc..f9b3d110f 100644 --- a/Subsurface/Source/Items/Components/ItemComponent.cs +++ b/Subsurface/Source/Items/Components/ItemComponent.cs @@ -221,7 +221,7 @@ namespace Barotrauma.Items.Components foreach (XElement subElement in element.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "requireditem": case "requireditems": @@ -395,7 +395,7 @@ namespace Barotrauma.Items.Components if (sound.VolumeProperty == "") return 1.0f; ObjectProperty op = null; - if (properties.TryGetValue(sound.VolumeProperty.ToLower(), out op)) + if (properties.TryGetValue(sound.VolumeProperty.ToLowerInvariant(), out op)) { float newVolume = 0.0f; try @@ -682,7 +682,7 @@ namespace Barotrauma.Items.Components foreach (XAttribute attribute in componentElement.Attributes()) { ObjectProperty property = null; - if (!properties.TryGetValue(attribute.Name.ToString().ToLower(), out property)) continue; + if (!properties.TryGetValue(attribute.Name.ToString().ToLowerInvariant(), out property)) continue; property.TrySetValue(attribute.Value); } @@ -692,7 +692,7 @@ namespace Barotrauma.Items.Components foreach (XElement subElement in componentElement.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "requireditem": RelatedItem newRequiredItem = RelatedItem.Load(subElement); @@ -717,7 +717,7 @@ namespace Barotrauma.Items.Components public static ItemComponent Load(XElement element, Item item, string file, bool errorMessages = true) { Type t; - string type = element.Name.ToString().ToLower(); + string type = element.Name.ToString().ToLowerInvariant(); try { // Get the type of a specified class. diff --git a/Subsurface/Source/Items/Components/ItemContainer.cs b/Subsurface/Source/Items/Components/ItemContainer.cs index 2d7c0e402..be6ef25ed 100644 --- a/Subsurface/Source/Items/Components/ItemContainer.cs +++ b/Subsurface/Source/Items/Components/ItemContainer.cs @@ -101,7 +101,7 @@ namespace Barotrauma.Items.Components foreach (XElement subElement in element.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "containable": RelatedItem containable = RelatedItem.Load(subElement); diff --git a/Subsurface/Source/Items/Components/Machines/Deconstructor.cs b/Subsurface/Source/Items/Components/Machines/Deconstructor.cs index 18784a4ca..2cbea0ad8 100644 --- a/Subsurface/Source/Items/Components/Machines/Deconstructor.cs +++ b/Subsurface/Source/Items/Components/Machines/Deconstructor.cs @@ -62,7 +62,7 @@ namespace Barotrauma.Items.Components { if (deconstructProduct.RequireFullCondition && targetItem.Condition < 100.0f) continue; - var itemPrefab = ItemPrefab.list.FirstOrDefault(ip => ip.Name.ToLower() == deconstructProduct.ItemPrefabName.ToLower()) as ItemPrefab; + var itemPrefab = ItemPrefab.list.FirstOrDefault(ip => ip.Name.ToLowerInvariant() == deconstructProduct.ItemPrefabName.ToLowerInvariant()) as ItemPrefab; if (itemPrefab==null) { DebugConsole.ThrowError("Tried to deconstruct item ''"+targetItem.Name+"'' but couldn't find item prefab ''"+deconstructProduct+"''!"); diff --git a/Subsurface/Source/Items/Components/Machines/Fabricator.cs b/Subsurface/Source/Items/Components/Machines/Fabricator.cs index 80e4b7b79..0af8ff80e 100644 --- a/Subsurface/Source/Items/Components/Machines/Fabricator.cs +++ b/Subsurface/Source/Items/Components/Machines/Fabricator.cs @@ -22,7 +22,7 @@ namespace Barotrauma.Items.Components { string name = ToolBox.GetAttributeString(element, "name", ""); - TargetItem = ItemPrefab.list.Find(ip => ip.Name.ToLower() == name.ToLower()) as ItemPrefab; + TargetItem = ItemPrefab.list.Find(ip => ip.Name.ToLowerInvariant() == name.ToLowerInvariant()) as ItemPrefab; if (TargetItem == null) { DebugConsole.ThrowError("Error in fabricable item "+name+"! Item ''" + element.Name + "'' not found."); @@ -40,7 +40,7 @@ namespace Barotrauma.Items.Components { if (string.IsNullOrWhiteSpace(requiredItemName)) continue; - ItemPrefab requiredItem = ItemPrefab.list.Find(ip => ip.Name.ToLower() == requiredItemName.Trim().ToLower()) as ItemPrefab; + ItemPrefab requiredItem = ItemPrefab.list.Find(ip => ip.Name.ToLowerInvariant() == requiredItemName.Trim().ToLowerInvariant()) as ItemPrefab; if (requiredItem == null) { DebugConsole.ThrowError("Error in fabricable item " + name + "! Required item ''" + requiredItemName + "'' not found."); @@ -64,7 +64,7 @@ namespace Barotrauma.Items.Components foreach (XElement subElement in element.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "requiredskill": RequiredSkills.Add(new Skill( diff --git a/Subsurface/Source/Items/Components/Machines/Radar.cs b/Subsurface/Source/Items/Components/Machines/Radar.cs index 44ebb88a3..11179755e 100644 --- a/Subsurface/Source/Items/Components/Machines/Radar.cs +++ b/Subsurface/Source/Items/Components/Machines/Radar.cs @@ -42,7 +42,7 @@ namespace Barotrauma.Items.Components foreach (XElement subElement in element.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "pingcircle": pingCircle = new Sprite(subElement); diff --git a/Subsurface/Source/Items/Components/Machines/Reactor.cs b/Subsurface/Source/Items/Components/Machines/Reactor.cs index fa835f642..cbe18715c 100644 --- a/Subsurface/Source/Items/Components/Machines/Reactor.cs +++ b/Subsurface/Source/Items/Components/Machines/Reactor.cs @@ -401,7 +401,7 @@ namespace Barotrauma.Items.Components public override bool AIOperate(float deltaTime, Character character, AIObjectiveOperateItem objective) { - switch (objective.Option.ToLower()) + switch (objective.Option.ToLowerInvariant()) { case "power up": float tempDiff = load - temperature; diff --git a/Subsurface/Source/Items/Components/Power/PowerTransfer.cs b/Subsurface/Source/Items/Components/Power/PowerTransfer.cs index abc917495..d4a8c5198 100644 --- a/Subsurface/Source/Items/Components/Power/PowerTransfer.cs +++ b/Subsurface/Source/Items/Components/Power/PowerTransfer.cs @@ -188,7 +188,7 @@ namespace Barotrauma.Items.Components { base.ReceiveSignal(stepsTaken, signal, connection, sender, power); - if (connection.Name.Length > 5 && connection.Name.Substring(0, 6).ToLower() == "signal") + if (connection.Name.Length > 5 && connection.Name.Substring(0, 6).ToLowerInvariant() == "signal") { connection.SendSignal(stepsTaken, signal, sender, 0.0f); } diff --git a/Subsurface/Source/Items/Components/Projectile.cs b/Subsurface/Source/Items/Components/Projectile.cs index 874f6ddea..e82bfe08f 100644 --- a/Subsurface/Source/Items/Components/Projectile.cs +++ b/Subsurface/Source/Items/Components/Projectile.cs @@ -54,7 +54,7 @@ namespace Barotrauma.Items.Components foreach (XElement subElement in element.Elements()) { - if (subElement.Name.ToString().ToLower() != "attack") continue; + if (subElement.Name.ToString().ToLowerInvariant() != "attack") continue; attack = new Attack(subElement); } diff --git a/Subsurface/Source/Items/Components/Signal/Connection.cs b/Subsurface/Source/Items/Components/Signal/Connection.cs index 0b8d6375e..37987afed 100644 --- a/Subsurface/Source/Items/Components/Signal/Connection.cs +++ b/Subsurface/Source/Items/Components/Signal/Connection.cs @@ -87,7 +87,7 @@ namespace Barotrauma.Items.Components foreach (XElement subElement in element.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "link": int index = -1; diff --git a/Subsurface/Source/Items/Components/Signal/LightComponent.cs b/Subsurface/Source/Items/Components/Signal/LightComponent.cs index 390ac749c..57b9e5958 100644 --- a/Subsurface/Source/Items/Components/Signal/LightComponent.cs +++ b/Subsurface/Source/Items/Components/Signal/LightComponent.cs @@ -93,7 +93,7 @@ namespace Barotrauma.Items.Components foreach (XElement subElement in element.Elements()) { - if (subElement.Name.ToString().ToLower() != "sprite") continue; + if (subElement.Name.ToString().ToLowerInvariant() != "sprite") continue; light.LightSprite = new Sprite(subElement); light.LightSprite.Origin = light.LightSprite.size / 2.0f; break; diff --git a/Subsurface/Source/Items/Components/Turret.cs b/Subsurface/Source/Items/Components/Turret.cs index f9a8bfdc0..f4d7925bd 100644 --- a/Subsurface/Source/Items/Components/Turret.cs +++ b/Subsurface/Source/Items/Components/Turret.cs @@ -187,7 +187,7 @@ namespace Barotrauma.Items.Components { var projectiles = GetLoadedProjectiles(); - if (projectiles.Count==0 || (projectiles.Count==1 && objective.Option.ToLower()!="fire at will")) + if (projectiles.Count == 0 || (projectiles.Count == 1 && objective.Option.ToLowerInvariant() != "fire at will")) { ItemContainer container = null; foreach (MapEntity e in item.linkedTo) @@ -272,7 +272,7 @@ namespace Barotrauma.Items.Components var pickedBody = Submarine.PickBody(ConvertUnits.ToSimUnits(item.WorldPosition), closestEnemy.SimPosition, null); if (pickedBody != null && !(pickedBody.UserData is Limb)) return false; - if (objective.Option.ToLower()=="fire at will") Use(deltaTime, character); + if (objective.Option.ToLowerInvariant() == "fire at will") Use(deltaTime, character); return false; diff --git a/Subsurface/Source/Items/FixRequirement.cs b/Subsurface/Source/Items/FixRequirement.cs index 37396ac48..e0884310a 100644 --- a/Subsurface/Source/Items/FixRequirement.cs +++ b/Subsurface/Source/Items/FixRequirement.cs @@ -29,7 +29,7 @@ namespace Barotrauma foreach (XElement subElement in element.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "skill": string skillName = ToolBox.GetAttributeString(subElement, "name", ""); diff --git a/Subsurface/Source/Items/Item.cs b/Subsurface/Source/Items/Item.cs index 6deee76ae..10173e8da 100644 --- a/Subsurface/Source/Items/Item.cs +++ b/Subsurface/Source/Items/Item.cs @@ -343,7 +343,7 @@ namespace Barotrauma foreach (XElement subElement in element.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "body": body = new PhysicsBody(subElement, ConvertUnits.ToSimUnits(Position)); @@ -535,7 +535,7 @@ namespace Barotrauma { if (tag == null) return true; - return (tags.Contains(tag) || tags.Contains(tag.ToLower())); + return (tags.Contains(tag) || tags.Contains(tag.ToLowerInvariant())); } diff --git a/Subsurface/Source/Items/ItemPrefab.cs b/Subsurface/Source/Items/ItemPrefab.cs index 0327e798b..75738453e 100644 --- a/Subsurface/Source/Items/ItemPrefab.cs +++ b/Subsurface/Source/Items/ItemPrefab.cs @@ -184,7 +184,7 @@ namespace Barotrauma XDocument doc = ToolBox.TryLoadXml(filePath); if (doc == null) return; - if (doc.Root.Name.ToString().ToLower() == "item") + if (doc.Root.Name.ToString().ToLowerInvariant() == "item") { new ItemPrefab(doc.Root, filePath); } @@ -192,7 +192,7 @@ namespace Barotrauma { foreach (XElement element in doc.Root.Elements()) { - if (element.Name.ToString().ToLower() != "item") continue; + if (element.Name.ToString().ToLowerInvariant() != "item") continue; new ItemPrefab(element, filePath); } @@ -253,7 +253,7 @@ namespace Barotrauma foreach (XElement subElement in element.Elements()) { - switch (subElement.Name.ToString().ToLower()) + switch (subElement.Name.ToString().ToLowerInvariant()) { case "sprite": string spriteFolder = ""; diff --git a/Subsurface/Source/Items/RelatedItem.cs b/Subsurface/Source/Items/RelatedItem.cs index 4d42d1f1d..a6cb62e39 100644 --- a/Subsurface/Source/Items/RelatedItem.cs +++ b/Subsurface/Source/Items/RelatedItem.cs @@ -148,7 +148,7 @@ namespace Barotrauma foreach (XElement subElement in element.Elements()) { - if (subElement.Name.ToString().ToLower() != "statuseffect") continue; + if (subElement.Name.ToString().ToLowerInvariant() != "statuseffect") continue; ri.statusEffects.Add(StatusEffect.Load(subElement)); } diff --git a/Subsurface/Source/Map/Map/LocationType.cs b/Subsurface/Source/Map/Map/LocationType.cs index 1d0e8bc3d..2fd6dc864 100644 --- a/Subsurface/Source/Map/Map/LocationType.cs +++ b/Subsurface/Source/Map/Map/LocationType.cs @@ -69,11 +69,11 @@ namespace Barotrauma hireableJobs = new List>(); foreach (XElement subElement in element.Elements()) { - if (subElement.Name.ToString().ToLower() != "hireable") continue; + if (subElement.Name.ToString().ToLowerInvariant() != "hireable") continue; string jobName = ToolBox.GetAttributeString(subElement, "name", ""); - JobPrefab jobPrefab = JobPrefab.List.Find(jp => jp.Name.ToLower() == jobName.ToLower()); + JobPrefab jobPrefab = JobPrefab.List.Find(jp => jp.Name.ToLowerInvariant() == jobName.ToLowerInvariant()); if (jobPrefab==null) { DebugConsole.ThrowError("Invalid job name ("+jobName+") in location type "+name); diff --git a/Subsurface/Source/Map/WayPoint.cs b/Subsurface/Source/Map/WayPoint.cs index 48d89e3f7..492c7cb17 100644 --- a/Subsurface/Source/Map/WayPoint.cs +++ b/Subsurface/Source/Map/WayPoint.cs @@ -223,8 +223,8 @@ namespace Barotrauma private bool EnterAssignedJob(GUITextBox textBox, string text) { - string trimmedName = text.ToLower().Trim(); - assignedJob = JobPrefab.List.Find(jp => jp.Name.ToLower() == trimmedName); + string trimmedName = text.ToLowerInvariant().Trim(); + assignedJob = JobPrefab.List.Find(jp => jp.Name.ToLowerInvariant() == trimmedName); if (assignedJob !=null && trimmedName!="none") { @@ -757,10 +757,10 @@ namespace Barotrauma w.IdCardTags = idCardTagString.Split(','); } - string jobName = ToolBox.GetAttributeString(element, "job", "").ToLower(); + string jobName = ToolBox.GetAttributeString(element, "job", "").ToLowerInvariant(); if (!string.IsNullOrWhiteSpace(jobName)) { - w.assignedJob = JobPrefab.List.Find(jp => jp.Name.ToLower() == jobName); + w.assignedJob = JobPrefab.List.Find(jp => jp.Name.ToLowerInvariant() == jobName); } w.ladderId = (ushort)ToolBox.GetAttributeInt(element, "ladders", 0); diff --git a/Subsurface/Source/Networking/GameClient.cs b/Subsurface/Source/Networking/GameClient.cs index 399257139..fdb32c0d1 100644 --- a/Subsurface/Source/Networking/GameClient.cs +++ b/Subsurface/Source/Networking/GameClient.cs @@ -975,7 +975,7 @@ namespace Barotrauma.Networking } else { - string command = ChatMessage.GetChatMessageCommand(message, out message).ToLower(); + string command = ChatMessage.GetChatMessageCommand(message, out message).ToLowerInvariant(); if (command=="r" || command=="radio" && CanUseRadio(Character.Controlled)) type = ChatMessageType.Radio; } diff --git a/Subsurface/Source/Networking/GameServer.cs b/Subsurface/Source/Networking/GameServer.cs index 21e73a1a3..e53f56549 100644 --- a/Subsurface/Source/Networking/GameServer.cs +++ b/Subsurface/Source/Networking/GameServer.cs @@ -1144,10 +1144,10 @@ namespace Barotrauma.Networking public void KickPlayer(string playerName, bool ban = false) { - playerName = playerName.ToLower(); + playerName = playerName.ToLowerInvariant(); - Client client = ConnectedClients.Find( c => c.name.ToLower() == playerName || - (c.Character != null && c.Character.Name.ToLower() == playerName)); + Client client = ConnectedClients.Find(c => c.name.ToLowerInvariant() == playerName || + (c.Character != null && c.Character.Name.ToLowerInvariant() == playerName)); if (client == null) return; @@ -1434,7 +1434,7 @@ namespace Barotrauma.Networking ChatMessageType type = gameStarted && myCharacter != null ? ChatMessageType.Default : ChatMessageType.Server; - string command = ChatMessage.GetChatMessageCommand(message, out message).ToLower(); + string command = ChatMessage.GetChatMessageCommand(message, out message).ToLowerInvariant(); if (command=="dead" || command=="d") { @@ -1447,8 +1447,8 @@ namespace Barotrauma.Networking else if (command != "") { targetClient = ConnectedClients.Find(c => - command == c.name.ToLower() || - c.Character != null && command == c.Character.Name.ToLower()); + command == c.name.ToLowerInvariant() || + (c.Character != null && command == c.Character.Name.ToLowerInvariant())); if (targetClient == null) { diff --git a/Subsurface/Source/Particles/ParticlePrefab.cs b/Subsurface/Source/Particles/ParticlePrefab.cs index 8b1b1e540..54efa74fa 100644 --- a/Subsurface/Source/Particles/ParticlePrefab.cs +++ b/Subsurface/Source/Particles/ParticlePrefab.cs @@ -51,7 +51,7 @@ namespace Barotrauma.Particles foreach (XElement subElement in element.Elements()) { - if (subElement.Name.ToString().ToLower() != "sprite") continue; + if (subElement.Name.ToString().ToLowerInvariant() != "sprite") continue; Sprites.Add(new Sprite(subElement)); } @@ -140,7 +140,7 @@ namespace Barotrauma.Particles RotateToDirection = ToolBox.GetAttributeBool(element, "rotatetodirection", false); - switch (ToolBox.GetAttributeString(element, "drawtarget", "air").ToLower()) + switch (ToolBox.GetAttributeString(element, "drawtarget", "air").ToLowerInvariant()) { case "air": default: diff --git a/Subsurface/Source/Properties.cs b/Subsurface/Source/Properties.cs index 7453e99d6..f4d036ddb 100644 --- a/Subsurface/Source/Properties.cs +++ b/Subsurface/Source/Properties.cs @@ -82,7 +82,7 @@ namespace Barotrauma } else if (property.PropertyType == typeof(bool)) { - propertyInfo.SetValue(obj, (value.ToLower() == "true"), null); + propertyInfo.SetValue(obj, (value.ToLowerInvariant() == "true"), null); } else if (property.PropertyType == typeof(int)) { @@ -201,7 +201,7 @@ namespace Barotrauma foreach (var property in properties) { - dictionary.Add(property.Name.ToLower(), new ObjectProperty(property, obj)); + dictionary.Add(property.Name.ToLowerInvariant(), new ObjectProperty(property, obj)); } return dictionary; @@ -221,7 +221,7 @@ namespace Barotrauma foreach (var property in properties) { ObjectProperty objProperty = new ObjectProperty(property, obj); - dictionary.Add(property.Name.ToLower(), objProperty); + dictionary.Add(property.Name.ToLowerInvariant(), objProperty); //set the value of the property to the default value if there is one foreach (var ini in property.Attributes.OfType()) @@ -238,7 +238,7 @@ namespace Barotrauma foreach (XAttribute attribute in element.Attributes()) { ObjectProperty property = null; - if (!dictionary.TryGetValue(attribute.Name.ToString().ToLower(), out property)) continue; + if (!dictionary.TryGetValue(attribute.Name.ToString().ToLowerInvariant(), out property)) continue; if (!property.Attributes.OfType().Any()) continue; property.TrySetValue(attribute.Value); } @@ -279,7 +279,7 @@ namespace Barotrauma stringValue = value.ToString(); } - element.Add(new XAttribute(property.Name.ToLower(), stringValue)); + element.Add(new XAttribute(property.Name.ToLowerInvariant(), stringValue)); } } } diff --git a/Subsurface/Source/Screens/GameScreen.cs b/Subsurface/Source/Screens/GameScreen.cs index 0dbbc797e..9540a0275 100644 --- a/Subsurface/Source/Screens/GameScreen.cs +++ b/Subsurface/Source/Screens/GameScreen.cs @@ -179,7 +179,7 @@ namespace Barotrauma GameMain.LightManager.ObstructVision = Character.Controlled != null && Character.Controlled.ObstructVision; GameMain.LightManager.UpdateLightMap(graphics, spriteBatch, cam); - if (Character.Controlled!=null) + if (Character.Controlled != null) { GameMain.LightManager.UpdateObstructVision(graphics, spriteBatch, cam, Character.Controlled.CursorWorldPosition); } @@ -194,7 +194,6 @@ namespace Barotrauma if (Level.Loaded == null) { graphics.Clear(new Color(11, 18, 26, 255)); - } else { diff --git a/Subsurface/Source/Screens/MainMenuScreen.cs b/Subsurface/Source/Screens/MainMenuScreen.cs index 83b32f28e..250ab5554 100644 --- a/Subsurface/Source/Screens/MainMenuScreen.cs +++ b/Subsurface/Source/Screens/MainMenuScreen.cs @@ -385,7 +385,7 @@ namespace Barotrauma XElement modeElement = null; foreach (XElement element in doc.Root.Elements()) { - if (element.Name.ToString().ToLower() != "gamemode") continue; + if (element.Name.ToString().ToLowerInvariant() != "gamemode") continue; modeElement = element; break; diff --git a/Subsurface/Source/Screens/ServerListScreen.cs b/Subsurface/Source/Screens/ServerListScreen.cs index 8b9d4cbb8..00d464ed9 100644 --- a/Subsurface/Source/Screens/ServerListScreen.cs +++ b/Subsurface/Source/Screens/ServerListScreen.cs @@ -142,7 +142,7 @@ namespace Barotrauma return; } - if (masterServerData.Substring(0,5).ToLower()=="error") + if (masterServerData.Substring(0, 5).ToLowerInvariant() == "error") { DebugConsole.ThrowError("Error while connecting to master server ("+masterServerData+")!"); diff --git a/Subsurface/Source/Sounds/SoundPlayer.cs b/Subsurface/Source/Sounds/SoundPlayer.cs index cc0faa22f..11f9944cd 100644 --- a/Subsurface/Source/Sounds/SoundPlayer.cs +++ b/Subsurface/Source/Sounds/SoundPlayer.cs @@ -122,7 +122,7 @@ namespace Barotrauma foreach (XElement element in xMusic) { string file = ToolBox.GetAttributeString(element, "file", ""); - string type = ToolBox.GetAttributeString(element, "type", "").ToLower(); + string type = ToolBox.GetAttributeString(element, "type", "").ToLowerInvariant(); Vector2 priority = ToolBox.GetAttributeVector2(element, "priorityrange", new Vector2(0.0f, 100.0f)); musicClips[i] = new BackgroundMusic(file, type, priority); diff --git a/Subsurface/Source/Utils/ToolBox.cs b/Subsurface/Source/Utils/ToolBox.cs index abc5f0487..17e8f8903 100644 --- a/Subsurface/Source/Utils/ToolBox.cs +++ b/Subsurface/Source/Utils/ToolBox.cs @@ -87,7 +87,7 @@ namespace Barotrauma } else { - string lowerTrimmedVal = value.ToLower().Trim(); + string lowerTrimmedVal = value.ToLowerInvariant().Trim(); if (lowerTrimmedVal == "true") { return true; @@ -186,7 +186,7 @@ namespace Barotrauma { if (attribute == null) return defaultValue; - string val = attribute.Value.ToLower().Trim(); + string val = attribute.Value.ToLowerInvariant().Trim(); if (val == "true") { return true;