jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

deprecate the gender property from the protocol entirely (#4496)

Browse source 
* deprecate the gender property from the protocol entirely

* use obsolete instead of deprecated

* add the database migration

* update internal database version as well
This commit is contained in:
ebbit1q 2021-12-14 07:51:57 +01:00 • committed by GitHub
parent 86881bbbc3
commit 07e6aadbbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 25 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/pb/game_commands.proto
View file

@ -26,7 +26,7 @@ message GameCommand {
NEXT_TURN = 1022;
SET_ACTIVE_PHASE = 1023;
DUMP_ZONE = 1024;
STOP_DUMP_ZONE = 1025; // deprecated
// STOP_DUMP_ZONE = 1025; // obsolete
REVEAL_CARDS = 1026;
MOVE_CARD = 1027;
SET_SIDEBOARD_PLAN = 1028;

2
common/pb/game_event.proto
View file

@ -28,7 +28,7 @@ message GameEvent {
SET_ACTIVE_PLAYER = 2016;
SET_ACTIVE_PHASE = 2017;
DUMP_ZONE = 2018;
STOP_DUMP_ZONE = 2019; // deprecated
// STOP_DUMP_ZONE = 2019; // obsolete
CHANGE_ZONE_PROPERTIES = 2020;
REVERSE_TURN = 2021;
}

7
common/pb/serverinfo_user.proto
View file

@ -8,16 +8,11 @@ message ServerInfo_User {
IsAdmin = 8;
IsJudge = 16;
};
enum Gender {
GenderUnknown = -1;
Male = 0;
Female = 1;
};
optional string name = 1;
optional uint32 user_level = 2;
optional string address = 3;
optional string real_name = 4;
optional Gender gender = 5 [default = GenderUnknown];
// gender = 5; // obsolete
optional string country = 6;
optional bytes avatar_bmp = 7;
optional sint32 id = 8 [default = -1];

5
common/pb/session_commands.proto
View file

@ -122,8 +122,7 @@ message Command_Register {
required string password = 2;
// Email address of the client for user validation
optional string email = 3;
// Gender of the user
optional ServerInfo_User.Gender gender = 4;
// gender = 4; // obsolete
// Country code of the user. 2 letter ISO format
optional string country = 5;
optional string real_name = 6;
@ -148,7 +147,7 @@ message Command_AccountEdit {
}
optional string real_name = 1;
optional string email = 2;
optional ServerInfo_User.Gender gender = 3;
// gender = 3; // obsolete
optional string country = 4;
}

5
common/server_database_interface.h
View file

@ -114,7 +114,6 @@ public:
}
virtual bool registerUser(const QString & /* userName */,
const QString & /* realName */,
ServerInfo_User_Gender const & /* gender */,
const QString & /* password */,
const QString & /* emailAddress */,
const QString & /* country */,
@ -159,10 +158,6 @@ public:
{
return false;
};
virtual QChar getGenderChar(ServerInfo_User_Gender const & /* gender */)
{
return QChar('u');
};
};
#endif