[Freecol-commits] SF.net SVN: freecol:[5532] freecol/trunk/src/net/sf/freecol/common/model/ Player.java

[<pr...@us...>]

Revision: 5532
          http://freecol.svn.sourceforge.net/freecol/?rev=5532&view=rev
Author:   pruano
Date:     2009-06-24 21:19:48 +0000 (Wed, 24 Jun 2009)

Log Message:
-----------
Port of rev.5531 from 0.8.x branch

Fixes bug #2630218 "Can not find unit in opponent move"

Modified Paths:
--------------
    freecol/trunk/src/net/sf/freecol/common/model/Player.java

Modified: freecol/trunk/src/net/sf/freecol/common/model/Player.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/common/model/Player.java	2009-06-24 21:12:30 UTC (rev 5531)
+++ freecol/trunk/src/net/sf/freecol/common/model/Player.java	2009-06-24 21:19:48 UTC (rev 5532)
@@ -1551,6 +1551,10 @@
                     Iterator<Position> positionIterator = map.getCircleIterator(position, true, unit.getLineOfSight());
                     while (positionIterator.hasNext()) {
                         Map.Position p = positionIterator.next();
+                        // inside the line of sight, but not yet explored
+                        if(!hasExplored(getGame().getMap().getTile(p))){
+                            continue;
+                        }
                         canSeeTiles[p.getX()][p.getY()] = true;
                         /*
                          * if (getGame().getViewOwner() == null &&
@@ -1587,6 +1591,10 @@
                                                                                 .getLineOfSight());
                     while (positionIterator.hasNext()) {
                         Map.Position p = positionIterator.next();
+                        // inside the line of sight, but not yet explored
+                        if(!hasExplored(getGame().getMap().getTile(p))){
+                            continue;
+                        }
                         canSeeTiles[p.getX()][p.getY()] = true;
                         /*
                          * if (getGame().getViewOwner() == null &&


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.