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
925b4a83
Commit
925b4a83
authored
Jan 01, 2015
by
Fabio Bas
Browse files
Fix "sender id" and "ip address" fields in game
parent
cd69bc8f
Changes
2
Hide whitespace changes
Inline
Side-by-side
common/server_game.cpp
View file @
925b4a83
...
...
@@ -436,7 +436,7 @@ void Server_Game::addPlayer(Server_AbstractUserInterface *userInterface, Respons
{
QMutexLocker
locker
(
&
gameMutex
);
Server_Player
*
newPlayer
=
new
Server_Player
(
this
,
nextPlayerId
++
,
userInterface
->
copyUserInfo
(
true
,
true
),
spectator
,
userInterface
);
Server_Player
*
newPlayer
=
new
Server_Player
(
this
,
nextPlayerId
++
,
userInterface
->
copyUserInfo
(
true
,
true
,
true
),
spectator
,
userInterface
);
newPlayer
->
moveToThread
(
thread
());
Event_Join
joinEvent
;
...
...
common/server_player.cpp
View file @
925b4a83
...
...
@@ -768,7 +768,7 @@ Response::ResponseCode Server_Player::cmdGameSay(const Command_GameSay &cmd, Res
event
.
set_message
(
cmd
.
message
());
ges
.
enqueueGameEvent
(
event
,
playerId
);
game
->
getRoom
()
->
getServer
()
->
getDatabaseInterface
()
->
logMessage
(
playerId
,
QString
::
fromStdString
(
userInfo
->
name
()),
QString
::
fromStdString
(
userInfo
->
address
()),
QString
::
fromStdString
(
cmd
.
message
()),
Server_DatabaseInterface
::
MessageTargetGame
,
game
->
getGameId
(),
game
->
getDescription
());
game
->
getRoom
()
->
getServer
()
->
getDatabaseInterface
()
->
logMessage
(
userInfo
->
id
()
,
QString
::
fromStdString
(
userInfo
->
name
()),
QString
::
fromStdString
(
userInfo
->
address
()),
QString
::
fromStdString
(
cmd
.
message
()),
Server_DatabaseInterface
::
MessageTargetGame
,
game
->
getGameId
(),
game
->
getDescription
());
return
Response
::
RespOk
;
}
...
...
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