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
4b84168b
Commit
4b84168b
authored
Jun 25, 2011
by
Max-Wilhelm Bruker
Browse files
client/server version bump; eventConnectionStateChanged
parent
d892d320
Changes
24
Expand all
Hide whitespace changes
Inline
Side-by-side
common/server_game.cpp
View file @
4b84168b
...
@@ -341,6 +341,13 @@ void Server_Game::nextTurn()
...
@@ -341,6 +341,13 @@ void Server_Game::nextTurn()
setActivePlayer
(
keys
[
listPos
]);
setActivePlayer
(
keys
[
listPos
]);
}
}
void
Server_Game
::
postConnectionStatusUpdate
(
Server_Player
*
player
,
bool
connectionStatus
)
{
QMutexLocker
locker
(
&
gameMutex
);
sendGameEvent
(
new
Event_ConnectionStateChanged
(
player
->
getPlayerId
(),
connectionStatus
));
}
QList
<
ServerInfo_Player
*>
Server_Game
::
getGameState
(
Server_Player
*
playerWhosAsking
)
const
QList
<
ServerInfo_Player
*>
Server_Game
::
getGameState
(
Server_Player
*
playerWhosAsking
)
const
{
{
QMutexLocker
locker
(
&
gameMutex
);
QMutexLocker
locker
(
&
gameMutex
);
...
...
common/server_game.h
View file @
4b84168b
...
@@ -88,6 +88,7 @@ public:
...
@@ -88,6 +88,7 @@ public:
void
setActivePlayer
(
int
_activePlayer
);
void
setActivePlayer
(
int
_activePlayer
);
void
setActivePhase
(
int
_activePhase
);
void
setActivePhase
(
int
_activePhase
);
void
nextTurn
();
void
nextTurn
();
void
postConnectionStatusUpdate
(
Server_Player
*
player
,
bool
connectionStatus
);
QList
<
ServerInfo_Player
*>
getGameState
(
Server_Player
*
playerWhosAsking
)
const
;
QList
<
ServerInfo_Player
*>
getGameState
(
Server_Player
*
playerWhosAsking
)
const
;
void
sendGameEvent
(
GameEvent
*
event
,
GameEventContext
*
context
=
0
,
Server_Player
*
exclude
=
0
);
void
sendGameEvent
(
GameEvent
*
event
,
GameEventContext
*
context
=
0
,
Server_Player
*
exclude
=
0
);
...
...
common/server_protocolhandler.cpp
View file @
4b84168b
This diff is collapsed.
Click to expand it.
servatrice/src/servatrice.cpp
View file @
4b84168b
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
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