mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-14 06:22:15 -07:00
Avoid repeating type by using auto. (#6321)
Took 19 minutes Took 22 seconds Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
parent
28dfd62163
commit
5df00de246
32 changed files with 116 additions and 117 deletions
|
|
@ -1095,12 +1095,11 @@ Server_AbstractPlayer::cmdCreateToken(const Command_CreateToken &cmd, ResponseCo
|
|||
arrowInfo->set_start_player_id(player->getPlayerId());
|
||||
arrowInfo->set_start_zone(startCard->getZone()->getName().toStdString());
|
||||
arrowInfo->set_start_card_id(startCard->getId());
|
||||
const Server_AbstractPlayer *arrowTargetPlayer =
|
||||
qobject_cast<const Server_AbstractPlayer *>(targetItem);
|
||||
const auto *arrowTargetPlayer = qobject_cast<const Server_AbstractPlayer *>(targetItem);
|
||||
if (arrowTargetPlayer != nullptr) {
|
||||
arrowInfo->set_target_player_id(arrowTargetPlayer->getPlayerId());
|
||||
} else {
|
||||
const Server_Card *arrowTargetCard = qobject_cast<const Server_Card *>(targetItem);
|
||||
const auto *arrowTargetCard = qobject_cast<const Server_Card *>(targetItem);
|
||||
arrowInfo->set_target_player_id(arrowTargetCard->getZone()->getPlayer()->getPlayerId());
|
||||
arrowInfo->set_target_zone(arrowTargetCard->getZone()->getName().toStdString());
|
||||
arrowInfo->set_target_card_id(arrowTargetCard->getId());
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ void Server_Arrow::getInfo(ServerInfo_Arrow *info)
|
|||
info->set_start_card_id(startCard->getId());
|
||||
info->mutable_arrow_color()->CopyFrom(arrowColor);
|
||||
|
||||
Server_Card *targetCard = qobject_cast<Server_Card *>(targetItem);
|
||||
auto *targetCard = qobject_cast<Server_Card *>(targetItem);
|
||||
if (targetCard) {
|
||||
info->set_target_player_id(targetCard->getZone()->getPlayer()->getPlayerId());
|
||||
info->set_target_zone(targetCard->getZone()->getName().toStdString());
|
||||
|
|
|
|||
|
|
@ -589,7 +589,7 @@ void Server_Game::removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_Abst
|
|||
for (Server_AbstractPlayer *anyPlayer : getPlayers().values()) {
|
||||
QList<Server_Arrow *> toDelete;
|
||||
for (auto *arrow : anyPlayer->getArrows().values()) {
|
||||
Server_Card *targetCard = qobject_cast<Server_Card *>(arrow->getTargetItem());
|
||||
auto *targetCard = qobject_cast<Server_Card *>(arrow->getTargetItem());
|
||||
if (targetCard) {
|
||||
if (targetCard->getZone() != nullptr && targetCard->getZone()->getPlayer() == player)
|
||||
toDelete.append(arrow);
|
||||
|
|
@ -781,7 +781,7 @@ void Server_Game::sendGameEventContainer(GameEventContainer *cont,
|
|||
GameEventContainer *
|
||||
Server_Game::prepareGameEvent(const ::google::protobuf::Message &gameEvent, int playerId, GameEventContext *context)
|
||||
{
|
||||
GameEventContainer *cont = new GameEventContainer;
|
||||
auto *cont = new GameEventContainer;
|
||||
cont->set_game_id(gameId);
|
||||
if (context)
|
||||
cont->mutable_context()->CopyFrom(*context);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue