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
584831b9
Commit
584831b9
authored
Jul 23, 2021
by
nanahira
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'server_mc' into server
parents
ebf4329a
1ab86ff5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
gframe/data_manager.cpp
gframe/data_manager.cpp
+3
-3
gframe/single_duel.cpp
gframe/single_duel.cpp
+2
-0
gframe/tag_duel.cpp
gframe/tag_duel.cpp
+2
-0
No files found.
gframe/data_manager.cpp
View file @
584831b9
...
@@ -224,10 +224,10 @@ const wchar_t* DataManager::GetText(int code) {
...
@@ -224,10 +224,10 @@ const wchar_t* DataManager::GetText(int code) {
return
unknown_string
;
return
unknown_string
;
}
}
const
wchar_t
*
DataManager
::
GetDesc
(
int
strCode
)
{
const
wchar_t
*
DataManager
::
GetDesc
(
int
strCode
)
{
if
(
strCode
<
10000
)
if
(
(
unsigned
int
)
strCode
<
10000u
)
return
GetSysString
(
strCode
);
return
GetSysString
(
strCode
);
int
code
=
strCode
>>
4
;
unsigned
int
code
=
strCode
>>
4
;
int
offset
=
strCode
&
0xf
;
unsigned
int
offset
=
strCode
&
0xf
;
auto
csit
=
_strings
.
find
(
code
);
auto
csit
=
_strings
.
find
(
code
);
if
(
csit
==
_strings
.
end
())
if
(
csit
==
_strings
.
end
())
return
unknown_string
;
return
unknown_string
;
...
...
gframe/single_duel.cpp
View file @
584831b9
...
@@ -71,10 +71,12 @@ void SingleDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
...
@@ -71,10 +71,12 @@ void SingleDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
is_recorder
=
true
;
is_recorder
=
true
;
cache_recorder
=
dp
;
cache_recorder
=
dp
;
}
}
#ifndef YGOPRO_SERVER_MODE_DISABLE_CLOUD_REPLAY
if
(
!
wcscmp
(
jpass
,
L"Marshtomp"
)
&&
!
replay_recorder
)
{
if
(
!
wcscmp
(
jpass
,
L"Marshtomp"
)
&&
!
replay_recorder
)
{
is_recorder
=
true
;
is_recorder
=
true
;
replay_recorder
=
dp
;
replay_recorder
=
dp
;
}
}
#endif //YGOPRO_SERVER_MODE_DISABLE_CLOUD_REPLAY
#else
#else
if
(
wcscmp
(
jpass
,
pass
))
{
if
(
wcscmp
(
jpass
,
pass
))
{
STOC_ErrorMsg
scem
;
STOC_ErrorMsg
scem
;
...
...
gframe/tag_duel.cpp
View file @
584831b9
...
@@ -67,10 +67,12 @@ void TagDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
...
@@ -67,10 +67,12 @@ void TagDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
is_recorder
=
true
;
is_recorder
=
true
;
cache_recorder
=
dp
;
cache_recorder
=
dp
;
}
}
#ifndef YGOPRO_SERVER_MODE_DISABLE_CLOUD_REPLAY
if
(
!
wcscmp
(
jpass
,
L"Marshtomp"
)
&&
!
replay_recorder
)
{
if
(
!
wcscmp
(
jpass
,
L"Marshtomp"
)
&&
!
replay_recorder
)
{
is_recorder
=
true
;
is_recorder
=
true
;
replay_recorder
=
dp
;
replay_recorder
=
dp
;
}
}
#endif //YGOPRO_SERVER_MODE_DISABLE_CLOUD_REPLAY
#else
#else
if
(
wcscmp
(
jpass
,
pass
))
{
if
(
wcscmp
(
jpass
,
pass
))
{
STOC_ErrorMsg
scem
;
STOC_ErrorMsg
scem
;
...
...
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