aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of ../bla

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-03-29 23:09:40 +02:00
commit 8e0f7dcf03
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/server_cardzone.cpp
View file

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