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-520DIY
ygopro
Commits
ee335948
Commit
ee335948
authored
Sep 06, 2020
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add MSG_RESET_TIME
parent
f579f597
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
35 additions
and
1 deletion
+35
-1
gframe/duelclient.cpp
gframe/duelclient.cpp
+4
-0
gframe/replay_mode.cpp
gframe/replay_mode.cpp
+4
-0
gframe/single_duel.cpp
gframe/single_duel.cpp
+11
-0
gframe/single_mode.cpp
gframe/single_mode.cpp
+4
-0
gframe/tag_duel.cpp
gframe/tag_duel.cpp
+11
-0
ocgcore
ocgcore
+1
-1
No files found.
gframe/duelclient.cpp
View file @
ee335948
...
@@ -1010,6 +1010,10 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
...
@@ -1010,6 +1010,10 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
is_swapping
=
false
;
is_swapping
=
false
;
}
}
switch
(
mainGame
->
dInfo
.
curMsg
)
{
switch
(
mainGame
->
dInfo
.
curMsg
)
{
case
MSG_RESET_TIME
:
{
pbuf
+=
2
;
break
;
}
case
MSG_RETRY
:
{
case
MSG_RETRY
:
{
if
(
last_successful_msg_length
)
{
if
(
last_successful_msg_length
)
{
char
*
p
=
last_successful_msg
;
char
*
p
=
last_successful_msg
;
...
...
gframe/replay_mode.cpp
View file @
ee335948
...
@@ -310,6 +310,10 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
...
@@ -310,6 +310,10 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
bool
pauseable
=
true
;
bool
pauseable
=
true
;
mainGame
->
dInfo
.
curMsg
=
BufferIO
::
ReadUInt8
(
pbuf
);
mainGame
->
dInfo
.
curMsg
=
BufferIO
::
ReadUInt8
(
pbuf
);
switch
(
mainGame
->
dInfo
.
curMsg
)
{
switch
(
mainGame
->
dInfo
.
curMsg
)
{
case
MSG_RESET_TIME
:
{
pbuf
+=
2
;
break
;
}
case
MSG_RETRY
:
{
case
MSG_RETRY
:
{
if
(
mainGame
->
dInfo
.
isReplaySkiping
)
{
if
(
mainGame
->
dInfo
.
isReplaySkiping
)
{
mainGame
->
dInfo
.
isReplaySkiping
=
false
;
mainGame
->
dInfo
.
isReplaySkiping
=
false
;
...
...
gframe/single_duel.cpp
View file @
ee335948
...
@@ -586,6 +586,17 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
...
@@ -586,6 +586,17 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
offset
=
pbuf
;
offset
=
pbuf
;
unsigned
char
engType
=
BufferIO
::
ReadUInt8
(
pbuf
);
unsigned
char
engType
=
BufferIO
::
ReadUInt8
(
pbuf
);
switch
(
engType
)
{
switch
(
engType
)
{
case
MSG_RESET_TIME
:
{
player
=
BufferIO
::
ReadInt8
(
pbuf
);
int
time
=
BufferIO
::
ReadInt8
(
pbuf
);
if
(
host_info
.
time_limit
)
{
if
(
time
)
time_limit
[
player
]
=
time
;
else
time_limit
[
player
]
=
host_info
.
time_limit
;
}
break
;
}
case
MSG_RETRY
:
{
case
MSG_RETRY
:
{
WaitforResponse
(
last_response
);
WaitforResponse
(
last_response
);
NetServer
::
SendBufferToPlayer
(
players
[
last_response
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
NetServer
::
SendBufferToPlayer
(
players
[
last_response
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
...
...
gframe/single_mode.cpp
View file @
ee335948
...
@@ -182,6 +182,10 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) {
...
@@ -182,6 +182,10 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) {
offset
=
pbuf
;
offset
=
pbuf
;
mainGame
->
dInfo
.
curMsg
=
BufferIO
::
ReadUInt8
(
pbuf
);
mainGame
->
dInfo
.
curMsg
=
BufferIO
::
ReadUInt8
(
pbuf
);
switch
(
mainGame
->
dInfo
.
curMsg
)
{
switch
(
mainGame
->
dInfo
.
curMsg
)
{
case
MSG_RESET_TIME
:
{
pbuf
+=
2
;
break
;
}
case
MSG_RETRY
:
{
case
MSG_RETRY
:
{
if
(
!
DuelClient
::
ClientAnalyze
(
offset
,
pbuf
-
offset
))
{
if
(
!
DuelClient
::
ClientAnalyze
(
offset
,
pbuf
-
offset
))
{
mainGame
->
singleSignal
.
Reset
();
mainGame
->
singleSignal
.
Reset
();
...
...
gframe/tag_duel.cpp
View file @
ee335948
...
@@ -550,6 +550,17 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
...
@@ -550,6 +550,17 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
offset
=
pbuf
;
offset
=
pbuf
;
unsigned
char
engType
=
BufferIO
::
ReadUInt8
(
pbuf
);
unsigned
char
engType
=
BufferIO
::
ReadUInt8
(
pbuf
);
switch
(
engType
)
{
switch
(
engType
)
{
case
MSG_RESET_TIME
:
{
player
=
BufferIO
::
ReadInt8
(
pbuf
);
int
time
=
BufferIO
::
ReadInt8
(
pbuf
);
if
(
host_info
.
time_limit
)
{
if
(
time
)
time_limit
[
player
]
=
time
;
else
time_limit
[
player
]
=
host_info
.
time_limit
;
}
break
;
}
case
MSG_RETRY
:
{
case
MSG_RETRY
:
{
WaitforResponse
(
last_response
);
WaitforResponse
(
last_response
);
NetServer
::
SendBufferToPlayer
(
cur_player
[
last_response
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
NetServer
::
SendBufferToPlayer
(
cur_player
[
last_response
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
...
...
ocgcore
@
b43c3762
Subproject commit
713fa28498e55cce46da359234c501ffe16d34d9
Subproject commit
b43c3762795b73c51c3bcb684fe789fc7bb07b17
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