Skip to content

Prevent opening hand result changes before duel start #3117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mercury233 merged 2 commits into from
Jun 21, 2026
Merged

Prevent opening hand result changes before duel start #3117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e787f17
strict rps
purerosefallen Jun 19, 2026
e38de3c
unification
mercury233 Jun 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions gframe/single_duel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,11 +354,12 @@ void SingleDuel::StartDuel(DuelPlayer* dp) {
duel_stage = DUEL_STAGE_FINGER;
}
void SingleDuel::HandResult(DuelPlayer* dp, unsigned char res) {
if(res > 3)
if(res == 0 || res > 3 || dp->state != CTOS_HAND_RESULT)
return;
if(dp->state != CTOS_HAND_RESULT)
auto player = dp->type;
if(hand_result[player])
return;
hand_result[dp->type] = res;
hand_result[player] = res;
if(hand_result[0] && hand_result[1]) {
STOC_HandResult schr;
schr.res1 = hand_result[0];
Expand Down
10 changes: 5 additions & 5 deletions gframe/tag_duel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,12 +320,12 @@ void TagDuel::StartDuel(DuelPlayer* dp) {
duel_stage = DUEL_STAGE_FINGER;
}
void TagDuel::HandResult(DuelPlayer* dp, unsigned char res) {
if(res > 3 || dp->state != CTOS_HAND_RESULT)
if(res == 0 || res > 3 || dp->state != CTOS_HAND_RESULT)
Comment thread
salix5 marked this conversation as resolved.
return;
if(dp->type == 0)
hand_result[0] = res;
else
hand_result[1] = res;
auto player = (dp->type & 0x2) >> 1;
if(hand_result[player])
return;
hand_result[player] = res;
if(hand_result[0] && hand_result[1]) {
STOC_HandResult schr;
schr.res1 = hand_result[0];
Expand Down
Loading