minor cleanups, server-side deck storage code is working again

common/.directory

@@ -1,6 +1,3 @@
 [Dolphin]
-Timestamp=2011,12,31,17,13,2
+Timestamp=2012,1,1,23,11,32
 Version=2
-
-[Settings]
-ShowDotFiles=true

common/pb/proto/serverinfo_user.proto

@@ -15,7 +15,7 @@ message ServerInfo_User {
 	optional uint32 user_level = 2;
 	optional string address = 3;
 	optional string real_name = 4;
-	optional Gender gender = 5;
+	optional Gender gender = 5 [default = GenderUnknown];
 	optional string country = 6;
 	optional bytes avatar_bmp = 7;
 }

common/server_game.cpp

@@ -39,7 +39,6 @@
 #include "pb/event_set_active_phase.pb.h"
 #include "pb/serverinfo_playerping.pb.h"
 #include <google/protobuf/descriptor.h>
-#include "protocol.h"
 #include <QTimer>
 #include <QDebug>
 

common/server_game.h

@@ -25,7 +25,7 @@
 #include <QObject>
 #include <QMutex>
 #include "server_player.h"
-#include "protocol.h"
+#include "server_response_containers.h"
 #include "pb/response.pb.h"
 #include "pb/serverinfo_player.pb.h"
 #include "pb/serverinfo_game.pb.h"

common/server_player.cpp

@@ -5,7 +5,6 @@
 #include "server_cardzone.h"
 #include "server_game.h"
 #include "server_protocolhandler.h"
-#include "protocol.h"
 #include "decklist.h"
 #include "pb/response.pb.h"
 #include "pb/command_move_card.pb.h"

common/server_protocolhandler.cpp

@@ -1,7 +1,6 @@
 #include <QDebug>
 #include "rng_abstract.h"
 #include "server_protocolhandler.h"
-#include "protocol.h"
 #include "server_room.h"
 #include "server_card.h"
 #include "server_arrow.h"

common/server_protocolhandler.h

@@ -4,7 +4,6 @@
 #include <QObject>
 #include <QPair>
 #include "server.h"
-#include "protocol.h"
 #include "pb/response.pb.h"
 #include "pb/server_message.pb.h"
 
@@ -13,6 +12,7 @@ class Server_Card;
 class ServerInfo_User;
 class Server_Room;
 class QTimer;
+class DeckList;
 
 class Message;
 class ServerMessage;
@@ -21,6 +21,8 @@ class Response;
 class SessionEvent;
 class GameEventContainer;
 class RoomEvent;
+class GameEventStorage;
+class ResponseContainer;
 
 class CommandContainer;
 class Command_Ping;

common/server_response_containers.h

@@ -16,8 +16,6 @@ class DeckList;
 class GameEvent;
 class GameEventContainer;
 class GameEventContext;
-#include <QDebug>
-static const int protocolVersion = 13;
 
 class GameEventStorageItem {
 public: