fix

5b121266 · nanahira · c4a1335c · 5b121266 · 9823d82d · 59e5af14
Commit 5b121266 authored May 06, 2024 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

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

ocgcore ocgcore +1 -1

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/ocgcore @ 9823d82d
+++ b/ocgcore @ 9823d82d
-Subproject commit 02254c8ce092e671d49a75e9d84554da83711e27
+Subproject commit 9823d82dda9b4e601a8a870e180ad3768179e2ec
--- a/script @ 59e5af14
+++ b/script @ 59e5af14
-Subproject commit a36b4d2096131605246d3c37f52aeab07175304b
+Subproject commit 59e5af144e6e35f842b1abb62bede801d5f5f005