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
949f8d23
Commit
949f8d23
authored
Jan 16, 2020
by
DailyShana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix client_card_sort
to satisfy strict weak ordering
parent
7680c3c3
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
11 deletions
+10
-11
gframe/client_card.cpp
gframe/client_card.cpp
+9
-6
gframe/config.h
gframe/config.h
+1
-0
gframe/deck_con.cpp
gframe/deck_con.cpp
+0
-1
gframe/deck_manager.cpp
gframe/deck_manager.cpp
+0
-1
gframe/duelclient.cpp
gframe/duelclient.cpp
+0
-1
gframe/event_handler.cpp
gframe/event_handler.cpp
+0
-1
gframe/replay.cpp
gframe/replay.cpp
+0
-1
No files found.
gframe/client_card.cpp
View file @
949f8d23
...
@@ -213,14 +213,17 @@ bool ClientCard::client_card_sort(ClientCard* c1, ClientCard* c2) {
...
@@ -213,14 +213,17 @@ bool ClientCard::client_card_sort(ClientCard* c1, ClientCard* c2) {
else
return
c1
->
sequence
<
c2
->
sequence
;
else
return
c1
->
sequence
<
c2
->
sequence
;
else
{
else
{
if
(
c1
->
location
&
(
LOCATION_DECK
|
LOCATION_GRAVE
|
LOCATION_REMOVED
|
LOCATION_EXTRA
))
{
if
(
c1
->
location
&
(
LOCATION_DECK
|
LOCATION_GRAVE
|
LOCATION_REMOVED
|
LOCATION_EXTRA
))
{
for
(
size_t
i
=
0
;
i
<
mainGame
->
dField
.
chains
.
size
();
++
i
)
{
auto
it1
=
std
::
find_if
(
mainGame
->
dField
.
chains
.
rbegin
(),
mainGame
->
dField
.
chains
.
rend
(),
[
c1
](
const
auto
&
ch
)
{
auto
chit
=
mainGame
->
dField
.
chains
[
i
];
return
c1
==
ch
.
chain_card
||
ch
.
target
.
find
(
c1
)
!=
ch
.
target
.
end
();
if
(
c1
==
chit
.
chain_card
||
chit
.
target
.
find
(
c1
)
!=
chit
.
target
.
end
())
});
return
true
;
auto
it2
=
std
::
find_if
(
mainGame
->
dField
.
chains
.
rbegin
(),
mainGame
->
dField
.
chains
.
rend
(),
[
c2
](
const
auto
&
ch
)
{
return
c2
==
ch
.
chain_card
||
ch
.
target
.
find
(
c2
)
!=
ch
.
target
.
end
();
});
if
(
it1
!=
mainGame
->
dField
.
chains
.
rend
()
||
it2
!=
mainGame
->
dField
.
chains
.
rend
())
{
return
it1
<
it2
;
}
}
return
c1
->
sequence
>
c2
->
sequence
;
return
c1
->
sequence
>
c2
->
sequence
;
}
}
else
else
return
c1
->
sequence
<
c2
->
sequence
;
return
c1
->
sequence
<
c2
->
sequence
;
}
}
}
}
...
...
gframe/config.h
View file @
949f8d23
...
@@ -72,6 +72,7 @@ inline int myswprintf(wchar_t(&buf)[N], const wchar_t* fmt, TR... args) {
...
@@ -72,6 +72,7 @@ inline int myswprintf(wchar_t(&buf)[N], const wchar_t* fmt, TR... args) {
#include <time.h>
#include <time.h>
#include <thread>
#include <thread>
#include <mutex>
#include <mutex>
#include <algorithm>
#include "bufferio.h"
#include "bufferio.h"
#include "myfilesystem.h"
#include "myfilesystem.h"
#include "mysignal.h"
#include "mysignal.h"
...
...
gframe/deck_con.cpp
View file @
949f8d23
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
#include "sound_manager.h"
#include "sound_manager.h"
#include "game.h"
#include "game.h"
#include "duelclient.h"
#include "duelclient.h"
#include <algorithm>
namespace
ygo
{
namespace
ygo
{
...
...
gframe/deck_manager.cpp
View file @
949f8d23
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
#include "data_manager.h"
#include "data_manager.h"
#include "network.h"
#include "network.h"
#include "game.h"
#include "game.h"
#include <algorithm>
namespace
ygo
{
namespace
ygo
{
...
...
gframe/duelclient.cpp
View file @
949f8d23
...
@@ -8,7 +8,6 @@
...
@@ -8,7 +8,6 @@
#include "game.h"
#include "game.h"
#include "replay.h"
#include "replay.h"
#include "replay_mode.h"
#include "replay_mode.h"
#include <algorithm>
namespace
ygo
{
namespace
ygo
{
...
...
gframe/event_handler.cpp
View file @
949f8d23
...
@@ -11,7 +11,6 @@
...
@@ -11,7 +11,6 @@
#include "single_mode.h"
#include "single_mode.h"
#include "materials.h"
#include "materials.h"
#include "../ocgcore/common.h"
#include "../ocgcore/common.h"
#include <algorithm>
namespace
ygo
{
namespace
ygo
{
...
...
gframe/replay.cpp
View file @
949f8d23
#include "replay.h"
#include "replay.h"
#include "../ocgcore/ocgapi.h"
#include "../ocgcore/ocgapi.h"
#include "../ocgcore/common.h"
#include "../ocgcore/common.h"
#include <algorithm>
#include "lzma/LzmaLib.h"
#include "lzma/LzmaLib.h"
namespace
ygo
{
namespace
ygo
{
...
...
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