[Pcb-src-changes] pcb.git: branch: master updated (ae2a8d395967ca92a4cfbc21d99ad26f5357ac26)

[<gi...@gp...>]

The branch, master has been updated
       via  ae2a8d395967ca92a4cfbc21d99ad26f5357ac26 (commit)
      from  1b287d76e7c0ae608b243ab311049bd5210d9ad8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/action.c    |    8 ++++----
 src/crosshair.c |    8 ++++----
 src/crosshair.h |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)


=================
 Commit Messages
=================

commit ae2a8d395967ca92a4cfbc21d99ad26f5357ac26
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>

    Remove visibility overriding argument from DrawMark()
    
    Because of the places it was used, we can gaurantee this doesn't
    change any behaviour - the mark visibility status is always correct,
    so doesn't need overriding.

:100644 100644 7493659... ad99e7a... M	src/action.c
:100644 100644 77b372f... 0ab59a4... M	src/crosshair.c
:100644 100644 8299778... b07af6f... M	src/crosshair.h

=========
 Changes
=========

commit ae2a8d395967ca92a4cfbc21d99ad26f5357ac26
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>

    Remove visibility overriding argument from DrawMark()
    
    Because of the places it was used, we can gaurantee this doesn't
    change any behaviour - the mark visibility status is always correct,
    so doesn't need overriding.

diff --git a/src/action.c b/src/action.c
index 7493659..ad99e7a 100644
--- a/src/action.c
+++ b/src/action.c
@@ -4058,7 +4058,7 @@ ActionMarkCrosshair (int argc, char **argv, int x, int y)
     {
       if (Marked.status)
 	{
-	  DrawMark (true);
+	  DrawMark ();
 	  Marked.status = false;
 	}
       else
@@ -4066,16 +4066,16 @@ ActionMarkCrosshair (int argc, char **argv, int x, int y)
 	  Marked.status = true;
 	  Marked.X = Crosshair.X;
 	  Marked.Y = Crosshair.Y;
-	  DrawMark (false);
+	  DrawMark ();
 	}
     }
   else if (GetFunctionID (function) == F_Center)
     {
-      DrawMark (true);
+      DrawMark ();
       Marked.status = true;
       Marked.X = Crosshair.X;
       Marked.Y = Crosshair.Y;
-      DrawMark (false);
+      DrawMark ();
     }
   return 0;
 }
diff --git a/src/crosshair.c b/src/crosshair.c
index 77b372f..0ab59a4 100644
--- a/src/crosshair.c
+++ b/src/crosshair.c
@@ -695,7 +695,7 @@ CrosshairOn (bool BlockToo)
     {
       Crosshair.On = true;
       DrawAttached (BlockToo);
-      DrawMark (true);
+      DrawMark ();
     }
 }
 
@@ -709,7 +709,7 @@ CrosshairOff (bool BlockToo)
     {
       Crosshair.On = false;
       DrawAttached (BlockToo);
-      DrawMark (true);
+      DrawMark ();
     }
 }
 
@@ -1105,9 +1105,9 @@ SetCrosshairRange (LocationType MinX, LocationType MinY, LocationType MaxX,
  * if argument is true, draw only if it is visible, otherwise draw it regardless
  */
 void
-DrawMark (bool ifvis)
+DrawMark (void)
 {
-  if (Marked.status || !ifvis)
+  if (Marked.status)
     {
       gui->draw_line (Crosshair.GC,
 		      Marked.X - MARK_SIZE,
diff --git a/src/crosshair.h b/src/crosshair.h
index 8299778..b07af6f 100644
--- a/src/crosshair.h
+++ b/src/crosshair.h
@@ -57,7 +57,7 @@ void SetCrosshairRange (LocationType, LocationType, LocationType,
 			LocationType);
 void InitCrosshair (void);
 void DestroyCrosshair (void);
-void DrawMark (bool);
+void DrawMark (void);
 void FitCrosshairIntoGrid (LocationType, LocationType);
 
 #endif