jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 08:34:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

client and server related crash fixes

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2009-08-06 16:51:11 +02:00
parent a2b30dc86f
commit 33546c6b74
8 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/game.cpp
View file

@ -185,7 +185,7 @@ void Game::gameEvent(const ServerEventData &msg)
localPlayer->gameEvent(msg);
else {
Player *p = players.findPlayer(msg.getPlayerId());
if (!p) {
if ((!p) && (msg.getEventType() != eventJoin)) {
// XXX
}
@ -194,8 +194,8 @@ void Game::gameEvent(const ServerEventData &msg)
emit logSay(p, msg.getEventData()[0]);
break;
case eventJoin: {
emit logJoin(p);
addPlayer(msg.getPlayerId(), msg.getPlayerName(), QPointF(0, 0), false);
Player *newPlayer = addPlayer(msg.getPlayerId(), msg.getPlayerName(), QPointF(0, 0), false);
emit logJoin(newPlayer);
break;
}
case eventLeave: