Merge branch 'master' of ../bla

This commit is contained in:
Max-Wilhelm Bruker 2011-03-29 23:09:40 +02:00
commit 8e0f7dcf03

View file

@ -200,9 +200,9 @@ void Server_CardZone::fixFreeSpaces(CommandContainer *cont)
moveCard(cont, coordMap, coordMap.value(y * 10000 + baseX + 1), baseX, y);
else if (coordMap.contains(y * 10000 + baseX + 2)) {
moveCard(cont, coordMap, coordMap.value(y * 10000 + baseX + 2), baseX, y);
return;
continue;
} else
return;
continue;
}
if (!coordMap.contains(y * 10000 + baseX + 1) && coordMap.contains(y * 10000 + baseX + 2))
moveCard(cont, coordMap, coordMap.value(y * 10000 + baseX + 2), baseX + 1, y);