[Igarden-commit] Garden/source/PlanTool WarningOverlay.cpp, 1.4.2.1, 1.4.2.2

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/Garden/source/PlanTool
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2740

Modified Files:
      Tag: Release_branch_v1
	WarningOverlay.cpp 
Log Message:
Don't load overlap image unless there are overlaps

Index: WarningOverlay.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/PlanTool/WarningOverlay.cpp,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -d -r1.4.2.1 -r1.4.2.2
*** WarningOverlay.cpp	2 Nov 2006 23:35:08 -0000	1.4.2.1
--- WarningOverlay.cpp	29 Nov 2006 03:42:32 -0000	1.4.2.2
***************
*** 65,77 ****
  			WarningOverlay::DisplayWarningImage(viewPtr, point);
  		}
! 		CGWorld		*image;
! 		image = GetWarningImage();
! 		if(image != NULL)
  		{
! 			count = matRef->CountOverlapPoints();
! 			for(n = 0; n < count; n++)
  			{
! 				point = matRef->GetIndexedOverlapPoint(n);
! 				image->CopyImage(viewPtr, point.xOffset-(kIconWidth/2), point.yOffset-(kIconHeight/2), kWarningImageZ, kIconWidth, kIconHeight, 1.0, 1.0);
  			}
  		}
--- 65,81 ----
  			WarningOverlay::DisplayWarningImage(viewPtr, point);
  		}
! 		count = matRef->CountOverlapPoints();
! 		if(count != 0)
  		{
! 			CGWorld		*image;
! 			image = GetWarningImage();
! 			if(image != NULL)
  			{
! 				for(n = 0; n < count; n++)
! 				{
! 					point = matRef->GetIndexedOverlapPoint(n);
! 					image->CopyImage(viewPtr, point.xOffset-(kIconWidth/2), point.yOffset-(kIconHeight/2),
! 									 kWarningImageZ, kIconWidth, kIconHeight, 1.0, 1.0);
! 				}
  			}
  		}