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

d1476e3d · wind2009 · 042a4a61 · 5b121266 · d1476e3d · 59e5af14
Commit d1476e3d authored May 06, 2024 by wind2009
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

gframe/game.cpp gframe/game.cpp +2 -4

script script +1 -1

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -1779,10 +1779,8 @@ int Game::LocalPlayer(int player) const {
 	return dInfo.isFirst ? pid : 1 - pid;
 }
 int Game::OppositePlayer(int player) {
-	if(dInfo.isTag)
-		return (player & 0x2) | (1 - (player & 0x1));
-	else
-		return 1 - player;
+	auto player_side_bit = dInfo.isTag ? 0x2 : 0x1;
+	return player ^ player_side_bit;
 }
 int Game::ChatLocalPlayer(int player) {
 	if(player > 3)

--- a/script @ 59e5af14
+++ b/script @ 59e5af14
-Subproject commit d269fab3d63c69474ab58813258e593b5f434d0f
+Subproject commit 59e5af144e6e35f842b1abb62bede801d5f5f005