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

List:       kde-commits
Subject:    playground/games/magazynier
From:       Tadeusz Andrzej Kadłubowski <yess () hell ! org ! pl>
Date:       2009-12-12 20:54:28
Message-ID: 1260651268.742392.29283.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1061731 by tkadlubo:

Fix LevelModel::move(), which is now used to construct possible moves in the future. \
There's not always a player on the current position.


 M  +2 -2      levelModel.cpp  


--- trunk/playground/games/magazynier/levelModel.cpp #1061730:1061731
@@ -296,7 +296,7 @@
 	MagazynierItem *here = getItem(pos);
 	MagazynierItem *target = getItem(pos + delta);
 		
-	if (here->itemType() == Player) {
+	if (here->itemType() == Player || here->itemType() == 0) {
 		kDebug() << "player moves to" << target->itemType();
 		if (target->itemType() == Empty) {
 			new MoveFromEmptyToEmptyCommand(this, pos, delta, aggregateCommand);
@@ -325,7 +325,7 @@
 				new MoveFromEmptyToGoalCommand(this, pos, delta, aggregateCommand);
 			}
 		}
-	} else if (here->itemType() == (Player | Goal)) {
+	} else if (here->itemType() == (Player | Goal) || here->itemType() == Goal) {
 		if (target->itemType() == Empty) {
 			new MoveFromGoalToEmptyCommand(this, pos, delta, aggregateCommand);
 		} else if (target->itemType() == Goal) {


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