[prev in list] [next in list] [prev in thread] [next in thread] 

List:       atlantik-devel
Subject:    [atlantik-cvs] CVS: kdegames/atlantik/libatlantikui board.cpp,
From:       kde () office ! kde ! org
Date:       2003-10-13 20:03:04
[Download RAW message or body]

Update of /home/kde/kdegames/atlantik/libatlantikui
In directory office:/tmp/cvs-serv3505/libatlantikui

Modified Files:
      Tag: KDE_3_1_BRANCH
	board.cpp 
Log Message:
backport fix for bug #65830


Index: board.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/board.cpp,v
retrieving revision 1.96.6.13
retrieving revision 1.96.6.14
diff -u -d -r1.96.6.13 -r1.96.6.14
--- board.cpp	10 Oct 2003 02:18:31 -0000	1.96.6.13
+++ board.cpp	13 Oct 2003 20:03:01 -0000	1.96.6.14
@@ -242,7 +242,12 @@
 		if (token->inJail() != player->inJail())
 		{
 			token->setInJail(player->inJail());
-			jump = true;
+
+			// If any status such as jail is ever allowed to
+			// change in the future, during movement, this needs
+			// to be addressed in moveToken and subsequent steps.
+			if (token != m_movingToken)
+				jump = true;
 		}
 			
 		if (token->location() != player->location())

_______________________________________________
atlantik-cvs mailing list
atlantik-cvs@mail.kde.org
http://mail.kde.org/mailman/listinfo/atlantik-cvs
[prev in list] [next in list] [prev in thread] [next in thread]