More fixes for erroneously being able to select object multiple times…

… when paint selecting
UltimateDoomBuilder · Feb 13, 2021 · 3fbad3c · 3fbad3c
1 parent 18d56c6
commit 3fbad3c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 21 deletions.
diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySector.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySector.cs
@@ -461,23 +461,28 @@ public virtual void OnMouseMove(MouseEventArgs e)
 				{
 					if (General.Interface.ShiftState ^ BuilderPlug.Me.AdditivePaintSelect)
 					{
-						this.selected = true;
-						mode.AddSelectedObject(this);
+						if (!selected)
+						{
+							selected = true;
+							mode.AddSelectedObject(this);
+						}
 					}
 					else if (General.Interface.CtrlState)
 					{
-						this.selected = false;
-						mode.RemoveSelectedObject(this);
-
+						if (selected)
+						{
+							selected = false;
+							mode.RemoveSelectedObject(this);
+						}
 					}
 					else
 					{
-						if (this.selected)
+						if (selected)
 							mode.RemoveSelectedObject(this);
 						else
 							mode.AddSelectedObject(this);
 
-						this.selected = !this.selected;
+						selected = !selected;
 					}
 				}
 

diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
@@ -1433,23 +1433,28 @@ public virtual void OnMouseMove(MouseEventArgs e)
 					// toggle selected state
 					if (General.Interface.ShiftState ^ BuilderPlug.Me.AdditivePaintSelect)
 					{
-						this.selected = true;
-						mode.AddSelectedObject(this);
+						if (!selected)
+						{
+							selected = true;
+							mode.AddSelectedObject(this);
+						}
 					}
 					else if (General.Interface.CtrlState)
 					{
-						this.selected = false;
-						mode.RemoveSelectedObject(this);
-
+						if (selected)
+						{
+							selected = false;
+							mode.RemoveSelectedObject(this);
+						}
 					}
 					else
 					{
-						if (this.selected)
+						if (selected)
 							mode.RemoveSelectedObject(this);
 						else
 							mode.AddSelectedObject(this);
 
-						this.selected = !this.selected;
+						selected = !selected;
 					}
 				}
 

diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs
@@ -878,23 +878,28 @@ public virtual void OnMouseMove(MouseEventArgs e)
 				{
 					if (General.Interface.ShiftState ^ BuilderPlug.Me.AdditivePaintSelect)
 					{
-						this.selected = true;
-						mode.AddSelectedObject(this);
+						if (!selected)
+						{
+							selected = true;
+							mode.AddSelectedObject(this);
+						}
 					}
 					else if (General.Interface.CtrlState)
 					{
-						this.selected = false;
-						mode.RemoveSelectedObject(this);
-
+						if (selected)
+						{
+							selected = false;
+							mode.RemoveSelectedObject(this);
+						}
 					}
 					else
 					{
-						if (this.selected)
+						if (selected)
 							mode.RemoveSelectedObject(this);
 						else
 							mode.AddSelectedObject(this);
 
-						this.selected = !this.selected;
+						selected = !selected;
 					}
 				}
 			}