cleanups, games work with ISL, now we just need to clean up better when the ISL connection dies

This commit is contained in:
Max-Wilhelm Bruker 2012-03-18 18:48:14 +01:00
parent c9a8429044
commit 5db0fcd6ae
28 changed files with 570 additions and 245 deletions

View file

@ -4,12 +4,13 @@ message Event_GameJoined {
extend SessionEvent {
optional Event_GameJoined ext = 1009;
}
optional sint32 game_id = 1;
optional string game_description = 2;
optional sint32 host_id = 3;
optional sint32 player_id = 4;
optional bool spectator = 5;
optional bool spectators_can_talk = 6;
optional bool spectators_see_everything = 7;
optional bool resuming = 8;
optional sint32 room_id = 1;
optional sint32 game_id = 2;
optional string game_description = 3;
optional sint32 host_id = 4;
optional sint32 player_id = 5;
optional bool spectator = 6;
optional bool spectators_can_talk = 7;
optional bool spectators_see_everything = 8;
optional bool resuming = 9;
}

View file

@ -6,19 +6,24 @@ import "room_event.proto";
message IslMessage {
enum MessageType {
RESPONSE = 0;
SESSION_EVENT = 1;
GAME_COMMAND_CONTAINER = 2;
GAME_EVENT_CONTAINER = 3;
ROOM_EVENT = 4;
GAME_COMMAND_CONTAINER = 0;
ROOM_COMMAND_CONTAINER = 1;
RESPONSE = 10;
SESSION_EVENT = 11;
GAME_EVENT_CONTAINER = 12;
ROOM_EVENT = 13;
}
optional MessageType message_type = 1;
optional sint32 game_id = 10;
optional uint64 session_id = 9;
optional sint32 player_id = 10 [default = -1];
optional Response response = 100;
optional SessionEvent session_event = 101;
optional CommandContainer game_command = 102;
optional GameEventContainer game_event_container = 103;
optional RoomEvent room_event = 104;
optional CommandContainer game_command = 100;
optional CommandContainer room_command = 101;
optional Response response = 200;
optional SessionEvent session_event = 201;
optional GameEventContainer game_event_container = 202;
optional RoomEvent room_event = 203;
}

View file

@ -20,4 +20,5 @@ message ServerInfo_User {
optional bytes avatar_bmp = 7;
optional sint32 id = 8 [default = -1];
optional sint32 server_id = 9 [default = -1];
optional uint64 session_id = 10;
}