Commit d1476e3d authored by wind2009's avatar wind2009

Merge remote-tracking branch 'upstream/patch-chat-reverse' into develop

parents 042a4a61 5b121266
...@@ -1779,10 +1779,8 @@ int Game::LocalPlayer(int player) const { ...@@ -1779,10 +1779,8 @@ int Game::LocalPlayer(int player) const {
return dInfo.isFirst ? pid : 1 - pid; return dInfo.isFirst ? pid : 1 - pid;
} }
int Game::OppositePlayer(int player) { int Game::OppositePlayer(int player) {
if(dInfo.isTag) auto player_side_bit = dInfo.isTag ? 0x2 : 0x1;
return (player & 0x2) | (1 - (player & 0x1)); return player ^ player_side_bit;
else
return 1 - player;
} }
int Game::ChatLocalPlayer(int player) { int Game::ChatLocalPlayer(int player) {
if(player > 3) if(player > 3)
......
Subproject commit d269fab3d63c69474ab58813258e593b5f434d0f Subproject commit 59e5af144e6e35f842b1abb62bede801d5f5f005
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment