rpms/colossus/F-11 4495.patch,NONE,1.1 colossus.spec,1.4,1.5

[Bruno Wolff III]

Author: bruno

Update of /cvs/pkgs/rpms/colossus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8247

Modified Files:
	colossus.spec 
Added Files:
	4495.patch 
Log Message:
Desert LOS bug fix



4495.patch:
 client/Strike.java |   13 +++++++------
 game/Battle.java   |   13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

--- NEW FILE 4495.patch ---
--- core/src/main/java/net/sf/colossus/game/Battle.java	(revision 4494)
+++ core/src/main/java/net/sf/colossus/game/Battle.java	(revision 4495)
@@ -392,7 +392,7 @@
             {
                 strikerAtop = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     strikerAtopCliff = true;
                 }
@@ -401,7 +401,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     midCliff = true;
                 }
@@ -417,7 +417,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     midCliff = true;
                 }
@@ -430,7 +430,7 @@
             {
                 targetAtop = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     targetAtopCliff = true;
                 }
@@ -439,7 +439,7 @@
             {
                 return true;
             }
-            if (midCliff && !strikerAtopCliff && !targetAtopCliff)
+            if (midCliff && (!strikerAtopCliff || !targetAtopCliff))
             {
                 return true;
             }
@@ -467,7 +467,8 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c' || hexside2 == 'c')
+                if (hexside == 'c' || hexside2 == 'c' || hexside == 'd' || 
+                    hexside2 == 'd')
                 {
                     midCliff = true;
                 }
--- core/src/main/java/net/sf/colossus/client/Strike.java	(revision 4494)
+++ core/src/main/java/net/sf/colossus/client/Strike.java	(revision 4495)
@@ -293,7 +293,7 @@
             {
                 strikerAtop = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     strikerAtopCliff = true;
                 }
@@ -303,7 +303,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     midCliff = true;
                 }
@@ -320,7 +320,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     midCliff = true;
                 }
@@ -335,7 +335,7 @@
             {
                 targetAtop = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     targetAtopCliff = true;
                 }
@@ -346,7 +346,7 @@
                 return true;
             }
 
-            if (midCliff && !strikerAtopCliff && !targetAtopCliff)
+            if (midCliff && (!strikerAtopCliff || !targetAtopCliff))
             {
                 return true;
             }
@@ -382,7 +382,8 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c' || hexside2 == 'c')
+                if (hexside == 'c' || hexside2 == 'c' || hexside == 'd' ||
+                    hexside2 == 'd')
                 {
                     midCliff = true;
                 }


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/colossus.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- colossus.spec	17 Aug 2009 20:36:04 -0000	1.4
+++ colossus.spec	19 Aug 2009 08:15:32 -0000	1.5
@@ -2,7 +2,7 @@ Name:           colossus
 %define         rev        4489
 %define         revdate    20090817
 Version:        0.9.1
-Release:        1.%{revdate}svn%{rev}%{?dist}
+Release:        2.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -20,6 +20,7 @@ URL:            http://colossus.sourcefo
 Source0:        colossus-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
+Patch1:         4495.patch
 
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
@@ -64,6 +65,7 @@ This package contains the API documentat
 
 %prep
 %setup -q -n %{name}-%{revdate}-%{rev}
+%patch1
 
 %build
 
@@ -179,6 +181,9 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* Wed Aug 19 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.1-2.20090817svn4489
+- Fix for desert LOS bug
+
 * Mon Aug 17 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.1-1.20090817svn4489
 - Rebase to new public release 0.9.1
 - 2 additional bug fixes