Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-2pick
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
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
MyCard
ygopro-2pick
Commits
99f60761
Commit
99f60761
authored
Jul 09, 2018
by
nanahira
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into server
parents
e99cc8e5
af45e60a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
gframe/game.cpp
gframe/game.cpp
+1
-1
ocgcore
ocgcore
+1
-1
No files found.
gframe/game.cpp
View file @
99f60761
...
@@ -1557,7 +1557,7 @@ void Game::ShowCardInfo(int code, bool resize) {
...
@@ -1557,7 +1557,7 @@ void Game::ShowCardInfo(int code, bool resize) {
}
}
stDataInfo
->
setText
(
formatBuffer
);
stDataInfo
->
setText
(
formatBuffer
);
int
offset_arrows
=
0
;
int
offset_arrows
=
0
;
if
(
cd
.
type
&
TYPE_LINK
&&
cd
.
level
>
5
&&
window_size
.
Width
<
12
2
0.0
)
if
(
cd
.
type
&
TYPE_LINK
&&
cd
.
level
>
5
&&
window_size
.
Width
<
12
9
0.0
)
offset_arrows
=
15
;
offset_arrows
=
15
;
stDataInfo
->
setRelativePosition
(
rect
<
s32
>
(
15
,
60
,
300
*
xScale
-
13
,
(
83
+
offset_arrows
)));
stDataInfo
->
setRelativePosition
(
rect
<
s32
>
(
15
,
60
,
300
*
xScale
-
13
,
(
83
+
offset_arrows
)));
//stSetName->setRelativePosition(rect<s32>(15, (83 + offset_arrows) * yScale, 296 * xScale, (83 + offset_arrows) * yScale + offset));
//stSetName->setRelativePosition(rect<s32>(15, (83 + offset_arrows) * yScale, 296 * xScale, (83 + offset_arrows) * yScale + offset));
...
...
ocgcore
@
16de746d
Subproject commit
8d2c3b0d947b6d6ce0d3135ffb60a3a7ec3ba550
Subproject commit
16de746dba127457ddd9e51e165f2cfa262784c7
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