Progress on tutorial, gap tweaking (water flows faster from room to room), UPnP error messages, input keys in array, underwater aiming tweaking, tons of misc stuff commit more often ffs

Subsurface/Source/GUI/GUIMessage.cs

@@ -18,12 +18,12 @@ namespace Subsurface
 
         public string Text
         {
-            get { return coloredText.text; }
+            get { return coloredText.Text; }
         }
 
         public Color Color
         {
-            get { return coloredText.color; }
+            get { return coloredText.Color; }
         }
 
         public Vector2 Pos

Subsurface/Source/GUI/GUIMessageBox.cs

@@ -15,6 +15,11 @@ namespace Subsurface
         //GUIFrame frame;
         public GUIButton[] Buttons;
 
+        public static GUIMessageBox VisibleBox
+        {
+            get { return MessageBoxes.Count==0 ? null : MessageBoxes.Peek(); }
+        }
+
         public string Text
         {
             get { return (children[1] as GUITextBlock).Text; }
@@ -63,8 +68,8 @@ namespace Subsurface
         public bool Close(GUIButton button, object obj)
         {
             if (parent != null) parent.RemoveChild(this);
+            if (MessageBoxes.Contains(this)) MessageBoxes.Dequeue();
 
-            MessageBoxes.Dequeue();
             return true;
         }
     }