[Huntforgold-commit] CVS: huntforgold/src/net/sourceforge/huntforgold/logic FencingState.java,1.11,1.12

[Jesper P. <je...@us...>]

Update of /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/logic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5688

Modified Files:
	FencingState.java 
Log Message:
Changed mode names

Index: FencingState.java
===================================================================
RCS file: /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/logic/FencingState.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- FencingState.java	6 Jul 2004 18:30:15 -0000	1.11
+++ FencingState.java	12 Jul 2004 15:21:44 -0000	1.12
@@ -28,11 +28,14 @@
   /** SHIP mode */
   public static final int SHIP = 0;
 
-  /** TOWN mode */
-  public static final int TOWN = 1;
+  /** FORT mode */
+  public static final int FORT = 1;
 
-  /** MARRIAGE mode */
-  public static final int MARRIAGE = 2;
+  /** GOVERNOR mode */
+  public static final int GOVERNOR = 2;
+
+  /** ALLEY mode */
+  public static final int ALLEY = 3;
 
   /** Delta value */
   public static final long DELTA = 150;
@@ -219,9 +222,9 @@
     if (enemy.getHitPoints() == 0) {
       if (mode == SHIP) {
         game.setCurrentState(CAPTURED_SHIP);      
-      } else if (mode == TOWN) {
+      } else if (mode == FORT) {
         game.setCurrentState(TOWN_VICTORY);              
-      } else if (mode == MARRIAGE) {
+      } else if (mode == GOVERNOR) {
         game.setCurrentState(DAUGHTER_MARRIAGE);              
       }        
     }
@@ -229,9 +232,9 @@
     if (pf.getHitPoints() == 0) {
       if (mode == SHIP) {
         game.setCurrentState(JAIL);      
-      } else if (mode == TOWN) {
+      } else if (mode == FORT) {
         game.setCurrentState(JAIL);              
-      } else if (mode == MARRIAGE) {
+      } else if (mode == GOVERNOR) {
         game.setCurrentState(DAUGHTER_LOST_FIGHT);              
       }        
     }