[Freecol-commits] freecol/src/net/sf/freecol/common/model ColonyTile.java,1.37,1.38 Unit.java,1.133,1.134

[Stian G. <sti...@us...>]

Update of /cvsroot/freecol/freecol/src/net/sf/freecol/common/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13567/src/net/sf/freecol/common/model

Modified Files:
	ColonyTile.java Unit.java 
Log Message:
Fixes the bug reported by: [ 1436675 ] Can't give orders to seasoned scout, and several other related bugs.

Index: Unit.java
===================================================================
RCS file: /cvsroot/freecol/freecol/src/net/sf/freecol/common/model/Unit.java,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** Unit.java	19 Feb 2006 12:57:54 -0000	1.133
--- Unit.java	7 Apr 2006 10:14:59 -0000	1.134
***************
*** 1448,1452 ****
      *       location.
      */
!     public boolean canArm() {
          return isArmed() || getGoodsDumpLocation() != null && getGoodsDumpLocation().getGoodsCount(Goods.MUSKETS) >= 50 ||
                 (location instanceof Europe || location instanceof Unit && ((Unit) location).getLocation() instanceof Europe) &&
--- 1448,1452 ----
      *       location.
      */
!     public boolean canBeArmed() {
          return isArmed() || getGoodsDumpLocation() != null && getGoodsDumpLocation().getGoodsCount(Goods.MUSKETS) >= 50 ||
                 (location instanceof Europe || location instanceof Unit && ((Unit) location).getLocation() instanceof Europe) &&
***************
*** 1460,1464 ****
      *       location.
      */
!     public boolean canMount() {
          return isMounted() || getGoodsDumpLocation() != null && getGoodsDumpLocation().getGoodsCount(Goods.HORSES) >= 50 ||
                 (location instanceof Europe || location instanceof Unit && ((Unit) location).getLocation() instanceof Europe)
--- 1460,1464 ----
      *       location.
      */
!     public boolean canBeMounted() {
          return isMounted() || getGoodsDumpLocation() != null && getGoodsDumpLocation().getGoodsCount(Goods.HORSES) >= 50 ||
                 (location instanceof Europe || location instanceof Unit && ((Unit) location).getLocation() instanceof Europe)
***************
*** 1472,1476 ****
      *       location.
      */
!     public boolean canEquipWithTools() {
          return isPioneer() || getGoodsDumpLocation() != null && getGoodsDumpLocation().getGoodsCount(Goods.TOOLS) >= 20 ||
                 (location instanceof Europe || location instanceof Unit && ((Unit) location).getLocation() instanceof Europe)
--- 1472,1476 ----
      *       location.
      */
!     public boolean canBeEquippedWithTools() {
          return isPioneer() || getGoodsDumpLocation() != null && getGoodsDumpLocation().getGoodsCount(Goods.TOOLS) >= 20 ||
                 (location instanceof Europe || location instanceof Unit && ((Unit) location).getLocation() instanceof Europe)
***************
*** 1484,1488 ****
      *       location.
      */
!     public boolean canDressAsMissionary() {
          return isMissionary() || ((location instanceof Europe || location instanceof Unit && ((Unit) location).getLocation()
                 instanceof Europe) || getTile() != null && getTile().getColony().getBuilding(Building.CHURCH).isBuilt());
--- 1484,1488 ----
      *       location.
      */
!     public boolean canBeDressedAsMissionary() {
          return isMissionary() || ((location instanceof Europe || location instanceof Unit && ((Unit) location).getLocation()
                 instanceof Europe) || getTile() != null && getTile().getColony().getBuilding(Building.CHURCH).isBuilt());

Index: ColonyTile.java
===================================================================
RCS file: /cvsroot/freecol/freecol/src/net/sf/freecol/common/model/ColonyTile.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** ColonyTile.java	3 Feb 2006 15:50:30 -0000	1.37
--- ColonyTile.java	7 Apr 2006 10:14:59 -0000	1.38
***************
*** 162,165 ****
--- 162,169 ----
              return false;
          }
+         
+         if (!((Unit) locatable).isColonist() && ((Unit) locatable).getType() != Unit.INDIAN_CONVERT) {
+             return false;
+         }
  
          return ( ! isColonyCenterTile()  &&  locatable instanceof Unit