(869ac975f) Merge branch 'master' into dev

2019-06-12 16:43:56 +03:00
parent eaf4f6afb8
commit e3ca616fff
28 changed files with 372 additions and 162 deletions
@@ -20,8 +20,8 @@ namespace Barotrauma
        /// </summary>
        const float CharacterWaitOnSwitch = 10.0f;

-        private List<CharacterInfo> characterInfos = new List<CharacterInfo>();
-        private List<Character> characters = new List<Character>();
+        private readonly List<CharacterInfo> characterInfos = new List<CharacterInfo>();
+        private readonly List<Character> characters = new List<Character>();

        private Point screenResolution;