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
b38f0e21
Commit
b38f0e21
authored
Jul 11, 2011
by
Max-Wilhelm Bruker
Browse files
extra logging; minor server crash fix
parent
c8813bb2
Changes
2
Hide whitespace changes
Inline
Side-by-side
common/server_game.cpp
View file @
b38f0e21
...
...
@@ -56,7 +56,7 @@ Server_Game::~Server_Game()
room
->
removeGame
(
this
);
delete
creatorInfo
;
qDebug
(
"Server_Game destructor
"
)
;
qDebug
(
)
<<
"Server_Game destructor
: gameId="
<<
gameId
;
}
void
Server_Game
::
pingClockTimeout
()
...
...
common/server_protocolhandler.cpp
View file @
b38f0e21
...
...
@@ -207,25 +207,26 @@ void Server_ProtocolHandler::processCommandContainer(CommandContainer *cont)
gameListMutex
.
lock
();
GameEventContainer
*
gQPublic
=
cont
->
getGameEventQueuePublic
();
if
(
gQPublic
)
{
Server_Game
*
game
=
games
.
value
(
gQPublic
->
getGameId
()).
first
;
Server_Player
*
player
=
games
.
value
(
gQPublic
->
getGameId
()).
second
;
GameEventContainer
*
gQPrivate
=
cont
->
getGameEventQueuePrivate
();
GameEventContainer
*
gQOmniscient
=
cont
->
getGameEventQueueOmniscient
();
if
(
gQPrivate
)
{
int
privatePlayerId
=
cont
->
getPrivatePlayerId
();
Server_Player
*
privatePlayer
;
if
(
privatePlayerId
==
-
1
)
privatePlayer
=
player
;
else
privatePlayer
=
game
->
getPlayer
(
privatePlayerId
);
if
(
gQOmniscient
)
{
game
->
sendGameEventContainer
(
gQPublic
,
privatePlayer
,
true
);
game
->
sendGameEventContainerOmniscient
(
gQOmniscient
,
privatePlayer
);
QPair
<
Server_Game
*
,
Server_Player
*>
gamePlayerPair
=
games
.
value
(
gQPublic
->
getGameId
());
if
(
gamePlayerPair
.
first
)
{
GameEventContainer
*
gQPrivate
=
cont
->
getGameEventQueuePrivate
();
GameEventContainer
*
gQOmniscient
=
cont
->
getGameEventQueueOmniscient
();
if
(
gQPrivate
)
{
int
privatePlayerId
=
cont
->
getPrivatePlayerId
();
Server_Player
*
privatePlayer
;
if
(
privatePlayerId
==
-
1
)
privatePlayer
=
gamePlayerPair
.
second
;
else
privatePlayer
=
gamePlayerPair
.
first
->
getPlayer
(
privatePlayerId
);
if
(
gQOmniscient
)
{
gamePlayerPair
.
first
->
sendGameEventContainer
(
gQPublic
,
privatePlayer
,
true
);
gamePlayerPair
.
first
->
sendGameEventContainerOmniscient
(
gQOmniscient
,
privatePlayer
);
}
else
gamePlayerPair
.
first
->
sendGameEventContainer
(
gQPublic
,
privatePlayer
);
privatePlayer
->
sendProtocolItem
(
gQPrivate
);
}
else
game
->
sendGameEventContainer
(
gQPublic
,
privatePlayer
);
privatePlayer
->
sendProtocolItem
(
gQPrivate
);
}
else
game
->
sendGameEventContainer
(
gQPublic
);
gamePlayerPair
.
first
->
sendGameEventContainer
(
gQPublic
);
}
}
gameListMutex
.
unlock
();
...
...
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