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

removed some debugging warnings; fixed card name and player name display; display avatar in game

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-10-11 19:01:46 +02:00
parent fbcb34db61
commit bd06cd5796
7 changed files with 67 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/server_protocolhandler.cpp
View file

@ -844,14 +844,16 @@ ResponseCode Server_ProtocolHandler::cmdCreateArrow(Command_CreateArrow *cmd, Co
targetZone = targetPlayer->getZones().value(cmd->getTargetZone());
if (!startZone || (!targetZone && !playerTarget))
return RespNameNotFound;
if (startZone->getType() != PublicZone)
return RespContextError;
Server_Card *startCard = startZone->getCard(cmd->getStartCardId(), false);
if (!startCard)
return RespNameNotFound;
Server_Card *targetCard = 0;
if (!playerTarget) {
targetCard = targetZone->getCard(cmd->getTargetCardId(), false);
if ((startZone->getType() != PublicZone) || (targetZone->getType() != PublicZone))
if (targetZone->getType() != PublicZone)
return RespContextError;
targetCard = targetZone->getCard(cmd->getTargetCardId(), false);
}
Server_ArrowTarget *targetItem;