Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
96ec4993
Commit
96ec4993
authored
Feb 11, 2014
by
Matt Kelly
Browse files
Resolve all compiler warnings
parent
44e83e91
Changes
3
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/abstractclient.cpp
View file @
96ec4993
...
@@ -82,6 +82,7 @@ void AbstractClient::processProtocolItem(const ServerMessage &item)
...
@@ -82,6 +82,7 @@ void AbstractClient::processProtocolItem(const ServerMessage &item)
case
SessionEvent
::
USER_LEFT
:
emit
userLeftEventReceived
(
event
.
GetExtension
(
Event_UserLeft
::
ext
));
break
;
case
SessionEvent
::
USER_LEFT
:
emit
userLeftEventReceived
(
event
.
GetExtension
(
Event_UserLeft
::
ext
));
break
;
case
SessionEvent
::
GAME_JOINED
:
emit
gameJoinedEventReceived
(
event
.
GetExtension
(
Event_GameJoined
::
ext
));
break
;
case
SessionEvent
::
GAME_JOINED
:
emit
gameJoinedEventReceived
(
event
.
GetExtension
(
Event_GameJoined
::
ext
));
break
;
case
SessionEvent
::
REPLAY_ADDED
:
emit
replayAddedEventReceived
(
event
.
GetExtension
(
Event_ReplayAdded
::
ext
));
break
;
case
SessionEvent
::
REPLAY_ADDED
:
emit
replayAddedEventReceived
(
event
.
GetExtension
(
Event_ReplayAdded
::
ext
));
break
;
default:
break
;
}
}
break
;
break
;
}
}
...
...
cockatrice/src/cardzone.cpp
View file @
96ec4993
...
@@ -143,6 +143,7 @@ QString CardZone::getTranslatedName(bool hisOwn, GrammaticalCase gc) const
...
@@ -143,6 +143,7 @@ QString CardZone::getTranslatedName(bool hisOwn, GrammaticalCase gc) const
?
tr
(
"his sideboard"
,
"nominative, male owner"
)
?
tr
(
"his sideboard"
,
"nominative, male owner"
)
:
tr
(
"%1's sideboard"
,
"nominative, male owner"
).
arg
(
ownerName
)
:
tr
(
"%1's sideboard"
,
"nominative, male owner"
).
arg
(
ownerName
)
);
);
default:
break
;
}
}
return
QString
();
return
QString
();
}
}
...
...
cockatrice/src/player.cpp
View file @
96ec4993
...
@@ -1514,8 +1514,8 @@ void Player::playCard(CardItem *c, bool faceDown, bool tapped)
...
@@ -1514,8 +1514,8 @@ void Player::playCard(CardItem *c, bool faceDown, bool tapped)
CardInfo
*
ci
=
c
->
getInfo
();
CardInfo
*
ci
=
c
->
getInfo
();
if
((
!
settingsCache
->
getPlayToStack
()
&&
ci
->
getTableRow
()
==
3
)
||
if
((
!
settingsCache
->
getPlayToStack
()
&&
ci
->
getTableRow
()
==
3
)
||
(
settingsCache
->
getPlayToStack
()
&&
ci
->
getTableRow
()
!=
0
)
&&
(
(
settingsCache
->
getPlayToStack
()
&&
ci
->
getTableRow
()
!=
0
)
&&
c
->
getZone
()
->
getName
().
toStdString
()
!=
"stack"
)
{
c
->
getZone
()
->
getName
().
toStdString
()
!=
"stack"
)
)
{
cmd
.
set_target_zone
(
"stack"
);
cmd
.
set_target_zone
(
"stack"
);
cmd
.
set_x
(
0
);
cmd
.
set_x
(
0
);
cmd
.
set_y
(
0
);
cmd
.
set_y
(
0
);
...
@@ -1784,6 +1784,7 @@ void Player::cardMenuAction()
...
@@ -1784,6 +1784,7 @@ void Player::cardMenuAction()
commandList
.
append
(
cmd
);
commandList
.
append
(
cmd
);
break
;
break
;
}
}
default:
break
;
}
}
}
}
else
{
else
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment