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
1d151d2d
Commit
1d151d2d
authored
Jan 10, 2013
by
Max-Wilhelm Bruker
Browse files
cmdDeckSelect fixed
parent
d6cddbea
Changes
2
Hide whitespace changes
Inline
Side-by-side
common/server_database_interface.h
View file @
1d151d2d
...
...
@@ -19,7 +19,7 @@ public:
virtual
bool
isInIgnoreList
(
const
QString
&
whoseList
,
const
QString
&
who
)
{
return
false
;
}
virtual
ServerInfo_User
getUserData
(
const
QString
&
name
,
bool
withId
=
false
)
=
0
;
virtual
void
storeGameInformation
(
const
QString
&
roomName
,
const
QStringList
&
roomGameTypes
,
const
ServerInfo_Game
&
gameInfo
,
const
QSet
<
QString
>
&
allPlayersEver
,
const
QSet
<
QString
>
&
allSpectatorsEver
,
const
QList
<
GameReplay
*>
&
replayList
)
{
}
virtual
DeckList
*
getDeckFromDatabase
(
int
deckId
,
const
QString
&
userName
)
{
return
0
;
}
virtual
DeckList
*
getDeckFromDatabase
(
int
deckId
,
int
userId
)
{
return
0
;
}
virtual
qint64
startSession
(
const
QString
&
userName
,
const
QString
&
address
)
{
return
0
;
}
public
slots
:
...
...
common/server_player.cpp
View file @
1d151d2d
...
...
@@ -630,7 +630,7 @@ Response::ResponseCode Server_Player::cmdDeckSelect(const Command_DeckSelect &cm
DeckList
*
newDeck
;
if
(
cmd
.
has_deck_id
())
{
try
{
newDeck
=
game
->
getRoom
()
->
getServer
()
->
getDatabaseInterface
()
->
getDeckFromDatabase
(
cmd
.
deck_id
(),
QString
::
fromStdString
(
userInfo
->
name
()
));
newDeck
=
game
->
getRoom
()
->
getServer
()
->
getDatabaseInterface
()
->
getDeckFromDatabase
(
cmd
.
deck_id
(),
userInfo
->
id
(
));
}
catch
(
Response
::
ResponseCode
r
)
{
return
r
;
}
...
...
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