(33ab1e038) Add buttons for resetting the settings to the defaults and setting the default keybindings. TODO: pressing the buttons should refresh the settings frame instead of closing it.

2019-04-04 11:10:14 +03:00
parent 371bcb11c1
commit b08a31a68f
63 changed files with 1069 additions and 668 deletions
@@ -22,14 +22,6 @@ namespace Barotrauma.Items.Components

        private float blinkTimer;
        
-        private bool itemLoaded;
-
-        private float blinkTimer;
-        
-        private bool itemLoaded;
-
-        private float blinkTimer;
-        
        public PhysicsBody ParentBody;

        [Editable(MinValueFloat = 0.0f, MaxValueFloat = 2048.0f), Serialize(100.0f, true)]
@@ -85,7 +77,7 @@ namespace Barotrauma.Items.Components
                
                IsActive = value;
 #if SERVER
-                if (GameMain.Server != null && itemLoaded) { item.CreateServerEvent(this); }
+                if (GameMain.Server != null && GameMain.Server.GameStarted) { item.CreateServerEvent(this); }
 #endif
            }
        }