4 Space Tabs
This commit is contained in:
Name
parent
1d3667f37d
commit
0128798c64
1 changed files with 190 additions and 190 deletions
|
|
@ -26,7 +26,7 @@
|
||||||
#include "pb/command_move_card.pb.h"
|
#include "pb/command_move_card.pb.h"
|
||||||
|
|
||||||
Server_CardZone::Server_CardZone(Server_Player *_player, const QString &_name, bool _has_coords, ServerInfo_Zone::ZoneType _type)
|
Server_CardZone::Server_CardZone(Server_Player *_player, const QString &_name, bool _has_coords, ServerInfo_Zone::ZoneType _type)
|
||||||
: player(_player),
|
: player(_player),
|
||||||
name(_name),
|
name(_name),
|
||||||
has_coords(_has_coords),
|
has_coords(_has_coords),
|
||||||
type(_type),
|
type(_type),
|
||||||
|
|
@ -37,255 +37,255 @@ Server_CardZone::Server_CardZone(Server_Player *_player, const QString &_name, b
|
||||||
|
|
||||||
Server_CardZone::~Server_CardZone()
|
Server_CardZone::~Server_CardZone()
|
||||||
{
|
{
|
||||||
qDebug() << "Server_CardZone destructor:" << name;
|
qDebug() << "Server_CardZone destructor:" << name;
|
||||||
clear();
|
clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Server_CardZone::shuffle()
|
void Server_CardZone::shuffle()
|
||||||
{
|
{
|
||||||
for (int i = cards.size() - 1; i > 0; i--){
|
for (int i = cards.size() - 1; i > 0; i--){
|
||||||
int j = rng->getNumber(0, i);//Assuming i is inclusive, i + 1 if exclusive (end result should be a number between 0 and i [0 and i included])
|
int j = rng->getNumber(0, i);//Assuming i is inclusive, i + 1 if exclusive (end result should be a number between 0 and i [0 and i included])
|
||||||
cards.swap(j,i);
|
cards.swap(j,i);
|
||||||
}
|
}
|
||||||
playersWithWritePermission.clear();
|
playersWithWritePermission.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void Server_CardZone::removeCardFromCoordMap(Server_Card *card, int oldX, int oldY)
|
void Server_CardZone::removeCardFromCoordMap(Server_Card *card, int oldX, int oldY)
|
||||||
{
|
{
|
||||||
if (oldX < 0)
|
if (oldX < 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const int baseX = (oldX / 3) * 3;
|
const int baseX = (oldX / 3) * 3;
|
||||||
QMap<int, Server_Card *> &coordMap = coordinateMap[oldY];
|
QMap<int, Server_Card *> &coordMap = coordinateMap[oldY];
|
||||||
|
|
||||||
if (coordMap.contains(baseX) && coordMap.contains(baseX + 1) && coordMap.contains(baseX + 2))
|
if (coordMap.contains(baseX) && coordMap.contains(baseX + 1) && coordMap.contains(baseX + 2))
|
||||||
// If the removal of this card has opened up a previously full pile...
|
// If the removal of this card has opened up a previously full pile...
|
||||||
freePilesMap[oldY].insert(coordMap.value(baseX)->getName(), baseX);
|
freePilesMap[oldY].insert(coordMap.value(baseX)->getName(), baseX);
|
||||||
|
|
||||||
coordMap.remove(oldX);
|
coordMap.remove(oldX);
|
||||||
|
|
||||||
if (!(coordMap.contains(baseX) && coordMap.value(baseX)->getName() == card->getName()) && !(coordMap.contains(baseX + 1) && coordMap.value(baseX + 1)->getName() == card->getName()) && !(coordMap.contains(baseX + 2) && coordMap.value(baseX + 2)->getName() == card->getName()))
|
if (!(coordMap.contains(baseX) && coordMap.value(baseX)->getName() == card->getName()) && !(coordMap.contains(baseX + 1) && coordMap.value(baseX + 1)->getName() == card->getName()) && !(coordMap.contains(baseX + 2) && coordMap.value(baseX + 2)->getName() == card->getName()))
|
||||||
// If this card was the last one with this name...
|
// If this card was the last one with this name...
|
||||||
freePilesMap[oldY].remove(card->getName(), baseX);
|
freePilesMap[oldY].remove(card->getName(), baseX);
|
||||||
|
|
||||||
if (!coordMap.contains(baseX) && !coordMap.contains(baseX + 1) && !coordMap.contains(baseX + 2)) {
|
if (!coordMap.contains(baseX) && !coordMap.contains(baseX + 1) && !coordMap.contains(baseX + 2)) {
|
||||||
// If the removal of this card has freed a whole pile, i.e. it was the last card in it...
|
// If the removal of this card has freed a whole pile, i.e. it was the last card in it...
|
||||||
if (baseX < freeSpaceMap[oldY])
|
if (baseX < freeSpaceMap[oldY])
|
||||||
freeSpaceMap[oldY] = baseX;
|
freeSpaceMap[oldY] = baseX;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Server_CardZone::insertCardIntoCoordMap(Server_Card *card, int x, int y)
|
void Server_CardZone::insertCardIntoCoordMap(Server_Card *card, int x, int y)
|
||||||
{
|
{
|
||||||
if (x < 0)
|
if (x < 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
coordinateMap[y].insert(x, card);
|
coordinateMap[y].insert(x, card);
|
||||||
if (!(x % 3)) {
|
if (!(x % 3)) {
|
||||||
if (!freePilesMap[y].contains(card->getName(), x) && card->getAttachedCards().isEmpty())
|
if (!freePilesMap[y].contains(card->getName(), x) && card->getAttachedCards().isEmpty())
|
||||||
freePilesMap[y].insert(card->getName(), x);
|
freePilesMap[y].insert(card->getName(), x);
|
||||||
if (freeSpaceMap[y] == x) {
|
if (freeSpaceMap[y] == x) {
|
||||||
int nextFreeX = x;
|
int nextFreeX = x;
|
||||||
do {
|
do {
|
||||||
nextFreeX += 3;
|
nextFreeX += 3;
|
||||||
} while (coordinateMap[y].contains(nextFreeX) || coordinateMap[y].contains(nextFreeX + 1) || coordinateMap[y].contains(nextFreeX + 2));
|
} while (coordinateMap[y].contains(nextFreeX) || coordinateMap[y].contains(nextFreeX + 1) || coordinateMap[y].contains(nextFreeX + 2));
|
||||||
freeSpaceMap[y] = nextFreeX;
|
freeSpaceMap[y] = nextFreeX;
|
||||||
}
|
}
|
||||||
} else if (!((x - 2) % 3)) {
|
} else if (!((x - 2) % 3)) {
|
||||||
const int baseX = (x / 3) * 3;
|
const int baseX = (x / 3) * 3;
|
||||||
freePilesMap[y].remove(coordinateMap[y].value(baseX)->getName(), baseX);
|
freePilesMap[y].remove(coordinateMap[y].value(baseX)->getName(), baseX);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int Server_CardZone::removeCard(Server_Card *card)
|
int Server_CardZone::removeCard(Server_Card *card)
|
||||||
{
|
{
|
||||||
int index = cards.indexOf(card);
|
int index = cards.indexOf(card);
|
||||||
cards.removeAt(index);
|
cards.removeAt(index);
|
||||||
if (has_coords)
|
if (has_coords)
|
||||||
removeCardFromCoordMap(card, card->getX(), card->getY());
|
removeCardFromCoordMap(card, card->getX(), card->getY());
|
||||||
card->setZone(0);
|
card->setZone(0);
|
||||||
|
|
||||||
return index;
|
return index;
|
||||||
}
|
}
|
||||||
|
|
||||||
Server_Card *Server_CardZone::getCard(int id, int *position, bool remove)
|
Server_Card *Server_CardZone::getCard(int id, int *position, bool remove)
|
||||||
{
|
{
|
||||||
if (type != ServerInfo_Zone::HiddenZone) {
|
if (type != ServerInfo_Zone::HiddenZone) {
|
||||||
for (int i = 0; i < cards.size(); ++i) {
|
for (int i = 0; i < cards.size(); ++i) {
|
||||||
Server_Card *tmp = cards[i];
|
Server_Card *tmp = cards[i];
|
||||||
if (tmp->getId() == id) {
|
if (tmp->getId() == id) {
|
||||||
if (position)
|
if (position)
|
||||||
*position = i;
|
*position = i;
|
||||||
if (remove) {
|
if (remove) {
|
||||||
cards.removeAt(i);
|
cards.removeAt(i);
|
||||||
tmp->setZone(0);
|
tmp->setZone(0);
|
||||||
}
|
}
|
||||||
return tmp;
|
return tmp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
} else {
|
} else {
|
||||||
if ((id >= cards.size()) || (id < 0))
|
if ((id >= cards.size()) || (id < 0))
|
||||||
return NULL;
|
return NULL;
|
||||||
Server_Card *tmp = cards[id];
|
Server_Card *tmp = cards[id];
|
||||||
if (position)
|
if (position)
|
||||||
*position = id;
|
*position = id;
|
||||||
if (remove) {
|
if (remove) {
|
||||||
cards.removeAt(id);
|
cards.removeAt(id);
|
||||||
tmp->setZone(0);
|
tmp->setZone(0);
|
||||||
}
|
}
|
||||||
return tmp;
|
return tmp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int Server_CardZone::getFreeGridColumn(int x, int y, const QString &cardName) const
|
int Server_CardZone::getFreeGridColumn(int x, int y, const QString &cardName) const
|
||||||
{
|
{
|
||||||
const QMap<int, Server_Card *> &coordMap = coordinateMap.value(y);
|
const QMap<int, Server_Card *> &coordMap = coordinateMap.value(y);
|
||||||
if (x == -1) {
|
if (x == -1) {
|
||||||
if (freePilesMap[y].contains(cardName)) {
|
if (freePilesMap[y].contains(cardName)) {
|
||||||
x = (freePilesMap[y].value(cardName) / 3) * 3;
|
x = (freePilesMap[y].value(cardName) / 3) * 3;
|
||||||
if (!coordMap.contains(x))
|
if (!coordMap.contains(x))
|
||||||
return x;
|
return x;
|
||||||
else if (!coordMap.contains(x + 1))
|
else if (!coordMap.contains(x + 1))
|
||||||
return x + 1;
|
return x + 1;
|
||||||
else
|
else
|
||||||
return x + 2;
|
return x + 2;
|
||||||
}
|
}
|
||||||
} else if (x >= 0) {
|
} else if (x >= 0) {
|
||||||
int resultX = 0;
|
int resultX = 0;
|
||||||
x = (x / 3) * 3;
|
x = (x / 3) * 3;
|
||||||
if (!coordMap.contains(x))
|
if (!coordMap.contains(x))
|
||||||
resultX = x;
|
resultX = x;
|
||||||
else if (!coordMap.value(x)->getAttachedCards().isEmpty()) {
|
else if (!coordMap.value(x)->getAttachedCards().isEmpty()) {
|
||||||
resultX = x;
|
resultX = x;
|
||||||
x = -1;
|
x = -1;
|
||||||
} else if (!coordMap.contains(x + 1))
|
} else if (!coordMap.contains(x + 1))
|
||||||
resultX = x + 1;
|
resultX = x + 1;
|
||||||
else if (!coordMap.contains(x + 2))
|
else if (!coordMap.contains(x + 2))
|
||||||
resultX = x + 2;
|
resultX = x + 2;
|
||||||
else {
|
else {
|
||||||
resultX = x;
|
resultX = x;
|
||||||
x = -1;
|
x = -1;
|
||||||
}
|
}
|
||||||
if (x < 0)
|
if (x < 0)
|
||||||
while (coordMap.contains(resultX))
|
while (coordMap.contains(resultX))
|
||||||
resultX += 3;
|
resultX += 3;
|
||||||
|
|
||||||
return resultX;
|
return resultX;
|
||||||
}
|
}
|
||||||
|
|
||||||
return freeSpaceMap[y];
|
return freeSpaceMap[y];
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Server_CardZone::isColumnStacked(int x, int y) const
|
bool Server_CardZone::isColumnStacked(int x, int y) const
|
||||||
{
|
{
|
||||||
if (!has_coords)
|
if (!has_coords)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return coordinateMap[y].contains((x / 3) * 3 + 1);
|
return coordinateMap[y].contains((x / 3) * 3 + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Server_CardZone::isColumnEmpty(int x, int y) const
|
bool Server_CardZone::isColumnEmpty(int x, int y) const
|
||||||
{
|
{
|
||||||
if (!has_coords)
|
if (!has_coords)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return !coordinateMap[y].contains((x / 3) * 3);
|
return !coordinateMap[y].contains((x / 3) * 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Server_CardZone::moveCardInRow(GameEventStorage &ges, Server_Card *card, int x, int y)
|
void Server_CardZone::moveCardInRow(GameEventStorage &ges, Server_Card *card, int x, int y)
|
||||||
{
|
{
|
||||||
CardToMove *cardToMove = new CardToMove;
|
CardToMove *cardToMove = new CardToMove;
|
||||||
cardToMove->set_card_id(card->getId());
|
cardToMove->set_card_id(card->getId());
|
||||||
player->moveCard(ges, this, QList<const CardToMove *>() << cardToMove, this, x, y, false, false);
|
player->moveCard(ges, this, QList<const CardToMove *>() << cardToMove, this, x, y, false, false);
|
||||||
delete cardToMove;
|
delete cardToMove;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Server_CardZone::fixFreeSpaces(GameEventStorage &ges)
|
void Server_CardZone::fixFreeSpaces(GameEventStorage &ges)
|
||||||
{
|
{
|
||||||
if (!has_coords)
|
if (!has_coords)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
QSet<QPair<int, int> > placesToLook;
|
QSet<QPair<int, int> > placesToLook;
|
||||||
for (int i = 0; i < cards.size(); ++i)
|
for (int i = 0; i < cards.size(); ++i)
|
||||||
placesToLook.insert(QPair<int, int>((cards[i]->getX() / 3) * 3, cards[i]->getY()));
|
placesToLook.insert(QPair<int, int>((cards[i]->getX() / 3) * 3, cards[i]->getY()));
|
||||||
|
|
||||||
QSetIterator<QPair<int, int> > placeIterator(placesToLook);
|
QSetIterator<QPair<int, int> > placeIterator(placesToLook);
|
||||||
while (placeIterator.hasNext()) {
|
while (placeIterator.hasNext()) {
|
||||||
const QPair<int, int> &foo = placeIterator.next();
|
const QPair<int, int> &foo = placeIterator.next();
|
||||||
int baseX = foo.first;
|
int baseX = foo.first;
|
||||||
int y = foo.second;
|
int y = foo.second;
|
||||||
|
|
||||||
if (!coordinateMap[y].contains(baseX)) {
|
if (!coordinateMap[y].contains(baseX)) {
|
||||||
if (coordinateMap[y].contains(baseX + 1))
|
if (coordinateMap[y].contains(baseX + 1))
|
||||||
moveCardInRow(ges, coordinateMap[y].value(baseX + 1), baseX, y);
|
moveCardInRow(ges, coordinateMap[y].value(baseX + 1), baseX, y);
|
||||||
else if (coordinateMap[y].contains(baseX + 2)) {
|
else if (coordinateMap[y].contains(baseX + 2)) {
|
||||||
moveCardInRow(ges, coordinateMap[y].value(baseX + 2), baseX, y);
|
moveCardInRow(ges, coordinateMap[y].value(baseX + 2), baseX, y);
|
||||||
continue;
|
continue;
|
||||||
} else
|
} else
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!coordinateMap[y].contains(baseX + 1) && coordinateMap[y].contains(baseX + 2))
|
if (!coordinateMap[y].contains(baseX + 1) && coordinateMap[y].contains(baseX + 2))
|
||||||
moveCardInRow(ges, coordinateMap[y].value(baseX + 2), baseX + 1, y);
|
moveCardInRow(ges, coordinateMap[y].value(baseX + 2), baseX + 1, y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Server_CardZone::updateCardCoordinates(Server_Card *card, int oldX, int oldY)
|
void Server_CardZone::updateCardCoordinates(Server_Card *card, int oldX, int oldY)
|
||||||
{
|
{
|
||||||
if (!has_coords)
|
if (!has_coords)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (oldX != -1)
|
if (oldX != -1)
|
||||||
removeCardFromCoordMap(card, oldX, oldY);
|
removeCardFromCoordMap(card, oldX, oldY);
|
||||||
insertCardIntoCoordMap(card, card->getX(), card->getY());
|
insertCardIntoCoordMap(card, card->getX(), card->getY());
|
||||||
}
|
}
|
||||||
|
|
||||||
void Server_CardZone::insertCard(Server_Card *card, int x, int y)
|
void Server_CardZone::insertCard(Server_Card *card, int x, int y)
|
||||||
{
|
{
|
||||||
if (hasCoords()) {
|
if (hasCoords()) {
|
||||||
card->setCoords(x, y);
|
card->setCoords(x, y);
|
||||||
cards.append(card);
|
cards.append(card);
|
||||||
insertCardIntoCoordMap(card, x, y);
|
insertCardIntoCoordMap(card, x, y);
|
||||||
} else {
|
} else {
|
||||||
card->setCoords(0, 0);
|
card->setCoords(0, 0);
|
||||||
if (x == -1)
|
if (x == -1)
|
||||||
cards.append(card);
|
cards.append(card);
|
||||||
else
|
else
|
||||||
cards.insert(x, card);
|
cards.insert(x, card);
|
||||||
}
|
}
|
||||||
card->setZone(this);
|
card->setZone(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Server_CardZone::clear()
|
void Server_CardZone::clear()
|
||||||
{
|
{
|
||||||
for (int i = 0; i < cards.size(); i++)
|
for (int i = 0; i < cards.size(); i++)
|
||||||
delete cards.at(i);
|
delete cards.at(i);
|
||||||
cards.clear();
|
cards.clear();
|
||||||
coordinateMap.clear();
|
coordinateMap.clear();
|
||||||
freePilesMap.clear();
|
freePilesMap.clear();
|
||||||
freeSpaceMap.clear();
|
freeSpaceMap.clear();
|
||||||
playersWithWritePermission.clear();
|
playersWithWritePermission.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Server_CardZone::addWritePermission(int playerId)
|
void Server_CardZone::addWritePermission(int playerId)
|
||||||
{
|
{
|
||||||
playersWithWritePermission.insert(playerId);
|
playersWithWritePermission.insert(playerId);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Server_CardZone::getInfo(ServerInfo_Zone *info, Server_Player *playerWhosAsking, bool omniscient)
|
void Server_CardZone::getInfo(ServerInfo_Zone *info, Server_Player *playerWhosAsking, bool omniscient)
|
||||||
{
|
{
|
||||||
info->set_name(name.toStdString());
|
info->set_name(name.toStdString());
|
||||||
info->set_type(type);
|
info->set_type(type);
|
||||||
info->set_with_coords(has_coords);
|
info->set_with_coords(has_coords);
|
||||||
info->set_card_count(cards.size());
|
info->set_card_count(cards.size());
|
||||||
info->set_always_reveal_top_card(alwaysRevealTopCard);
|
info->set_always_reveal_top_card(alwaysRevealTopCard);
|
||||||
if (
|
if (
|
||||||
(((playerWhosAsking == player) || omniscient) && (type != ServerInfo_Zone::HiddenZone))
|
(((playerWhosAsking == player) || omniscient) && (type != ServerInfo_Zone::HiddenZone))
|
||||||
|| ((playerWhosAsking != player) && (type == ServerInfo_Zone::PublicZone))
|
|| ((playerWhosAsking != player) && (type == ServerInfo_Zone::PublicZone))
|
||||||
) {
|
) {
|
||||||
QListIterator<Server_Card *> cardIterator(cards);
|
QListIterator<Server_Card *> cardIterator(cards);
|
||||||
while (cardIterator.hasNext())
|
while (cardIterator.hasNext())
|
||||||
cardIterator.next()->getInfo(info->add_card_list());
|
cardIterator.next()->getInfo(info->add_card_list());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue