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
nanahira
ygopro
Commits
5d3ededa
Commit
5d3ededa
authored
Oct 21, 2018
by
mercury233
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
6286fd32
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
14 deletions
+12
-14
gframe/drawing.cpp
gframe/drawing.cpp
+7
-7
gframe/game.cpp
gframe/game.cpp
+4
-6
gframe/game.h
gframe/game.h
+1
-1
No files found.
gframe/drawing.cpp
View file @
5d3ededa
...
...
@@ -832,8 +832,8 @@ void Game::DrawSpec() {
}
case
100
:
{
if
(
showcardp
<
60
)
{
driver
->
draw2DImage
(
imageManager
.
tHand
[(
showcardcode
>>
16
)
&
0x3
],
Resize
(
615
,
showcarddif
));
driver
->
draw2DImage
(
imageManager
.
tHand
[
showcardcode
&
0x3
],
Resize
(
615
,
540
-
showcarddif
));
driver
->
draw2DImage
(
imageManager
.
tHand
[(
showcardcode
>>
16
)
&
0x3
],
position2di
((
615
+
44.5
)
*
xScale
-
44.5
,
(
showcarddif
+
64
)
*
yScale
-
64
));
driver
->
draw2DImage
(
imageManager
.
tHand
[
showcardcode
&
0x3
],
position2di
((
615
+
44.5
)
*
xScale
-
44.5
,
(
540
-
showcarddif
+
64
)
*
yScale
-
64
));
float
dy
=
-
0.333333
f
*
showcardp
+
10
;
showcardp
++
;
if
(
showcardp
<
30
)
...
...
@@ -891,16 +891,16 @@ void Game::DrawSpec() {
auto
pos
=
lpcFont
->
getDimension
(
lstr
);
if
(
showcardp
<
10
)
{
int
alpha
=
(
showcardp
*
25
)
<<
24
;
DrawShadowText
(
lpcFont
,
lstr
,
Resize
Elem
(
650
-
pos
.
Width
/
2
-
(
9
-
showcardp
)
*
40
,
290
,
950
,
370
),
Resize
(
-
1
,
-
1
,
0
,
0
),
alpha
|
0xffffff
,
alpha
);
DrawShadowText
(
lpcFont
,
lstr
,
Resize
PhaseHint
(
660
-
(
9
-
showcardp
)
*
40
,
290
,
960
,
370
,
pos
.
Width
),
Resize
(
-
1
,
-
1
,
0
,
0
),
alpha
|
0xffffff
,
alpha
);
}
else
if
(
showcardp
<
showcarddif
)
{
DrawShadowText
(
lpcFont
,
lstr
,
Resize
Elem
(
650
-
pos
.
Width
/
2
,
290
,
950
,
370
),
Resize
(
-
1
,
-
1
,
0
,
0
),
0xffffffff
);
DrawShadowText
(
lpcFont
,
lstr
,
Resize
PhaseHint
(
660
,
290
,
960
,
370
,
pos
.
Width
),
Resize
(
-
1
,
-
1
,
0
,
0
),
0xffffffff
);
if
(
dInfo
.
vic_string
&&
(
showcardcode
==
1
||
showcardcode
==
2
))
{
driver
->
draw2DRectangle
(
0xa0000000
,
Resize
Elem
(
540
,
320
,
80
0
,
340
));
DrawShadowText
(
guiFont
,
dInfo
.
vic_string
,
Resize
Elem
(
50
0
,
320
,
840
,
340
),
Resize
(
-
2
,
-
1
,
0
,
0
),
0xffffffff
,
0xff000000
,
true
,
true
,
0
);
driver
->
draw2DRectangle
(
0xa0000000
,
Resize
(
540
,
320
,
79
0
,
340
));
DrawShadowText
(
guiFont
,
dInfo
.
vic_string
,
Resize
(
49
0
,
320
,
840
,
340
),
Resize
(
-
2
,
-
1
,
0
,
0
),
0xffffffff
,
0xff000000
,
true
,
true
,
0
);
}
}
else
if
(
showcardp
<
showcarddif
+
10
)
{
int
alpha
=
((
showcarddif
+
10
-
showcardp
)
*
25
)
<<
24
;
DrawShadowText
(
lpcFont
,
lstr
,
Resize
Elem
(
650
-
pos
.
Width
/
2
+
(
showcardp
-
showcarddif
)
*
40
,
290
,
950
,
370
),
Resize
(
-
1
,
-
1
,
0
,
0
),
alpha
|
0xffffff
,
alpha
);
DrawShadowText
(
lpcFont
,
lstr
,
Resize
PhaseHint
(
660
+
(
showcardp
-
showcarddif
)
*
40
,
290
,
960
,
370
,
pos
.
Width
),
Resize
(
-
1
,
-
1
,
0
,
0
),
alpha
|
0xffffff
,
alpha
);
}
showcardp
++
;
break
;
...
...
gframe/game.cpp
View file @
5d3ededa
...
...
@@ -1717,13 +1717,11 @@ recti Game::ResizeWin(s32 x, s32 y, s32 x2, s32 y2, bool chat) {
y2
=
sy
+
y
;
return
recti
(
x
,
y
,
x2
,
y2
);
}
recti
Game
::
ResizeElem
(
s32
x
,
s32
y
,
s32
x2
,
s32
y2
)
{
s32
sx
=
x2
-
x
;
s32
sy
=
y2
-
y
;
x
=
(
x
+
sx
/
2
-
100
)
*
xScale
-
sx
/
2
+
100
;
recti
Game
::
ResizePhaseHint
(
s32
x
,
s32
y
,
s32
x2
,
s32
y2
,
s32
width
)
{
x
=
x
*
xScale
-
width
/
2
;
y
=
y
*
yScale
;
x2
=
sx
+
x
;
y2
=
sy
+
y
;
x2
=
x2
*
xScale
;
y2
=
y2
*
yScale
;
return
recti
(
x
,
y
,
x2
,
y2
);
}
recti
Game
::
ResizeCard
(
s32
x
,
s32
y
,
s32
x2
,
s32
y2
)
{
...
...
gframe/game.h
View file @
5d3ededa
...
...
@@ -158,7 +158,7 @@ public:
recti
Resize
(
s32
x
,
s32
y
,
s32
x2
,
s32
y2
,
s32
dx
,
s32
dy
,
s32
dx2
,
s32
dy2
);
position2di
Resize
(
s32
x
,
s32
y
);
position2di
ResizeReverse
(
s32
x
,
s32
y
);
recti
Resize
Elem
(
s32
x
,
s32
y
,
s32
x2
,
s32
y2
);
recti
Resize
PhaseHint
(
s32
x
,
s32
y
,
s32
x2
,
s32
y2
,
s32
width
);
recti
ResizeWin
(
s32
x
,
s32
y
,
s32
x2
,
s32
y2
,
bool
chat
=
false
);
recti
ResizeCard
(
s32
x
,
s32
y
,
s32
x2
,
s32
y2
);
recti
ResizeCardHint
(
s32
x
,
s32
y
,
s32
x2
,
s32
y2
);
...
...
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