Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
ygopro
Commits
445cbfba
Commit
445cbfba
authored
May 06, 2024
by
wind2009
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/patch-chat-reverse' into develop
parents
501db5c0
c4a1335c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
18 deletions
+13
-18
gframe/game.cpp
gframe/game.cpp
+11
-16
gframe/game.h
gframe/game.h
+2
-2
No files found.
gframe/game.cpp
View file @
445cbfba
...
...
@@ -1778,21 +1778,13 @@ int Game::LocalPlayer(int player) const {
int
pid
=
player
?
1
:
0
;
return
dInfo
.
isFirst
?
pid
:
1
-
pid
;
}
int
Game
::
OppositePlayer
(
int
player
)
const
{
if
(
dInfo
.
isTag
)
{
if
(
player
==
0
)
return
2
;
if
(
player
==
1
)
return
3
;
if
(
player
==
2
)
return
0
;
if
(
player
==
3
)
return
1
;
return
player
;
}
else
int
Game
::
OppositePlayer
(
int
player
)
{
if
(
dInfo
.
isTag
)
return
(
player
&
0x2
)
|
(
1
-
(
player
&
0x1
));
else
return
1
-
player
;
}
int
Game
::
ChatLocalPlayer
(
int
player
)
const
{
int
Game
::
ChatLocalPlayer
(
int
player
)
{
if
(
player
>
3
)
return
player
;
bool
is_self
;
...
...
@@ -1809,13 +1801,16 @@ int Game::ChatLocalPlayer(int player) const {
if
(
dInfo
.
isTag
)
{
is_self
=
(
player
&
0x2
)
==
0
&&
(
player
&
0x1
)
==
(
DuelClient
::
selftype
&
0x1
);
}
else
{
is_self
=
(
player
==
0
)
;
is_self
=
player
==
0
;
}
return
player
|
(
is_self
?
0x10
:
0
);
}
else
{
// when in lobby
return
player
|
(
player
==
DuelClient
::
selftype
?
0x10
:
0
);
is_self
=
player
==
DuelClient
::
selftype
;
}
if
(
dInfo
.
isTag
&&
(
player
==
1
||
player
==
2
))
{
player
=
3
-
player
;
}
return
player
|
(
is_self
?
0x10
:
0
);
}
const
wchar_t
*
Game
::
LocalName
(
int
local_player
)
{
return
local_player
==
0
?
dInfo
.
hostname
:
dInfo
.
clientname
;
...
...
gframe/game.h
View file @
445cbfba
...
...
@@ -169,8 +169,8 @@ public:
void
CloseDuelWindow
();
int
LocalPlayer
(
int
player
)
const
;
int
OppositePlayer
(
int
player
)
const
;
int
ChatLocalPlayer
(
int
player
)
const
;
int
OppositePlayer
(
int
player
);
int
ChatLocalPlayer
(
int
player
);
const
wchar_t
*
LocalName
(
int
local_player
);
bool
HasFocus
(
EGUI_ELEMENT_TYPE
type
)
const
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment