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
List
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
苍蓝
ygopro
Commits
ba65c383
Commit
ba65c383
authored
Jul 04, 2019
by
DailyShana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server should send STOC to client but not CTOS
although these two have the same value
parent
e444e818
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
gframe/single_duel.cpp
gframe/single_duel.cpp
+2
-2
gframe/tag_duel.cpp
gframe/tag_duel.cpp
+2
-2
No files found.
gframe/single_duel.cpp
View file @
ba65c383
...
@@ -362,13 +362,13 @@ void SingleDuel::HandResult(DuelPlayer* dp, unsigned char res) {
...
@@ -362,13 +362,13 @@ void SingleDuel::HandResult(DuelPlayer* dp, unsigned char res) {
}
else
if
((
hand_result
[
0
]
==
1
&&
hand_result
[
1
]
==
2
)
}
else
if
((
hand_result
[
0
]
==
1
&&
hand_result
[
1
]
==
2
)
||
(
hand_result
[
0
]
==
2
&&
hand_result
[
1
]
==
3
)
||
(
hand_result
[
0
]
==
2
&&
hand_result
[
1
]
==
3
)
||
(
hand_result
[
0
]
==
3
&&
hand_result
[
1
]
==
1
))
{
||
(
hand_result
[
0
]
==
3
&&
hand_result
[
1
]
==
1
))
{
NetServer
::
SendPacketToPlayer
(
players
[
1
],
CTOS_TP_RESULT
);
NetServer
::
SendPacketToPlayer
(
players
[
1
],
STOC_SELECT_TP
);
tp_player
=
1
;
tp_player
=
1
;
players
[
0
]
->
state
=
0xff
;
players
[
0
]
->
state
=
0xff
;
players
[
1
]
->
state
=
CTOS_TP_RESULT
;
players
[
1
]
->
state
=
CTOS_TP_RESULT
;
duel_stage
=
DUEL_STAGE_FIRSTGO
;
duel_stage
=
DUEL_STAGE_FIRSTGO
;
}
else
{
}
else
{
NetServer
::
SendPacketToPlayer
(
players
[
0
],
CTOS_TP_RESULT
);
NetServer
::
SendPacketToPlayer
(
players
[
0
],
STOC_SELECT_TP
);
players
[
1
]
->
state
=
0xff
;
players
[
1
]
->
state
=
0xff
;
players
[
0
]
->
state
=
CTOS_TP_RESULT
;
players
[
0
]
->
state
=
CTOS_TP_RESULT
;
tp_player
=
0
;
tp_player
=
0
;
...
...
gframe/tag_duel.cpp
View file @
ba65c383
...
@@ -322,12 +322,12 @@ void TagDuel::HandResult(DuelPlayer* dp, unsigned char res) {
...
@@ -322,12 +322,12 @@ void TagDuel::HandResult(DuelPlayer* dp, unsigned char res) {
}
else
if
((
hand_result
[
0
]
==
1
&&
hand_result
[
1
]
==
2
)
}
else
if
((
hand_result
[
0
]
==
1
&&
hand_result
[
1
]
==
2
)
||
(
hand_result
[
0
]
==
2
&&
hand_result
[
1
]
==
3
)
||
(
hand_result
[
0
]
==
2
&&
hand_result
[
1
]
==
3
)
||
(
hand_result
[
0
]
==
3
&&
hand_result
[
1
]
==
1
))
{
||
(
hand_result
[
0
]
==
3
&&
hand_result
[
1
]
==
1
))
{
NetServer
::
SendPacketToPlayer
(
players
[
2
],
CTOS_TP_RESULT
);
NetServer
::
SendPacketToPlayer
(
players
[
2
],
STOC_SELECT_TP
);
players
[
0
]
->
state
=
0xff
;
players
[
0
]
->
state
=
0xff
;
players
[
2
]
->
state
=
CTOS_TP_RESULT
;
players
[
2
]
->
state
=
CTOS_TP_RESULT
;
duel_stage
=
DUEL_STAGE_FIRSTGO
;
duel_stage
=
DUEL_STAGE_FIRSTGO
;
}
else
{
}
else
{
NetServer
::
SendPacketToPlayer
(
players
[
0
],
CTOS_TP_RESULT
);
NetServer
::
SendPacketToPlayer
(
players
[
0
],
STOC_SELECT_TP
);
players
[
2
]
->
state
=
0xff
;
players
[
2
]
->
state
=
0xff
;
players
[
0
]
->
state
=
CTOS_TP_RESULT
;
players
[
0
]
->
state
=
CTOS_TP_RESULT
;
duel_stage
=
DUEL_STAGE_FIRSTGO
;
duel_stage
=
DUEL_STAGE_FIRSTGO
;
...
...
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