jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

moc weirdness workaround on Unix, added install target

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-01-21 22:13:27 +01:00
parent f385917a90
commit e202d659a0
6 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/server_player.cpp
View file

@ -16,6 +16,7 @@
#include "pb/event_move_card.pb.h"
#include "pb/event_set_card_attr.pb.h"
#include "pb/context_move_card.pb.h"
#include "pb/context_undo_draw.pb.h"
#include <QDebug>
Server_Player::Server_Player(Server_Game *_game, int _playerId, const ServerInfo_User &_userInfo, bool _spectator, Server_ProtocolHandler *_handler)
@ -422,7 +423,6 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges, Server_Car
Event_DestroyCard event;
event.set_zone_name(startzone->getName().toStdString());
event.set_card_id(card->getId());
ges.setGameEventContext(Context_MoveCard());
ges.enqueueGameEvent(event, playerId);
card->deleteLater();
@ -510,6 +510,11 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges, Server_Car
setCardAttrHelper(ges, targetzone->getName(), card->getId(), AttrPT, ptString);
}
}
if (undoingDraw)
ges.setGameEventContext(Context_UndoDraw());
else
ges.setGameEventContext(Context_MoveCard());
if (startzone->hasCoords() && fixFreeSpaces)
startzone->fixFreeSpaces(ges);