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
2217e080
Commit
2217e080
authored
Apr 07, 2017
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
d51773a5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
9 deletions
+15
-9
gframe/drawing.cpp
gframe/drawing.cpp
+10
-4
gframe/duelclient.cpp
gframe/duelclient.cpp
+1
-1
gframe/event_handler.cpp
gframe/event_handler.cpp
+1
-1
gframe/materials.cpp
gframe/materials.cpp
+1
-1
ocgcore
ocgcore
+1
-1
script
script
+1
-1
No files found.
gframe/drawing.cpp
View file @
2217e080
...
@@ -307,14 +307,20 @@ void Game::DrawMisc() {
...
@@ -307,14 +307,20 @@ void Game::DrawMisc() {
driver
->
drawVertexPrimitiveList
(
matManager
.
vActivate
,
4
,
matManager
.
iRectangle
,
2
);
driver
->
drawVertexPrimitiveList
(
matManager
.
vActivate
,
4
,
matManager
.
iRectangle
,
2
);
}
}
if
(
dField
.
pzone_act
[
0
])
{
if
(
dField
.
pzone_act
[
0
])
{
im
.
setTranslation
(
vector3df
((
matManager
.
vFieldSzone
[
0
][
6
][
0
].
Pos
.
X
+
matManager
.
vFieldSzone
[
0
][
6
][
1
].
Pos
.
X
)
/
2
,
int
seq
=
0
;
(
matManager
.
vFieldSzone
[
0
][
6
][
0
].
Pos
.
Y
+
matManager
.
vFieldSzone
[
0
][
6
][
2
].
Pos
.
Y
)
/
2
,
0.03
f
));
if
(
dField
.
szone
[
0
][
6
]
&&
dField
.
szone
[
0
][
6
]
->
lscale
)
seq
=
6
;
im
.
setTranslation
(
vector3df
((
matManager
.
vFieldSzone
[
0
][
seq
][
0
].
Pos
.
X
+
matManager
.
vFieldSzone
[
0
][
seq
][
1
].
Pos
.
X
)
/
2
,
(
matManager
.
vFieldSzone
[
0
][
6
][
0
].
Pos
.
Y
+
matManager
.
vFieldSzone
[
0
][
seq
][
2
].
Pos
.
Y
)
/
2
,
0.03
f
));
driver
->
setTransform
(
irr
::
video
::
ETS_WORLD
,
im
);
driver
->
setTransform
(
irr
::
video
::
ETS_WORLD
,
im
);
driver
->
drawVertexPrimitiveList
(
matManager
.
vActivate
,
4
,
matManager
.
iRectangle
,
2
);
driver
->
drawVertexPrimitiveList
(
matManager
.
vActivate
,
4
,
matManager
.
iRectangle
,
2
);
}
}
if
(
dField
.
pzone_act
[
1
])
{
if
(
dField
.
pzone_act
[
1
])
{
im
.
setTranslation
(
vector3df
((
matManager
.
vFieldSzone
[
0
][
7
][
0
].
Pos
.
X
+
matManager
.
vFieldSzone
[
0
][
7
][
1
].
Pos
.
X
)
/
2
,
int
seq
=
0
;
(
matManager
.
vFieldSzone
[
0
][
7
][
0
].
Pos
.
Y
+
matManager
.
vFieldSzone
[
0
][
7
][
2
].
Pos
.
Y
)
/
2
,
0.03
f
));
if
(
dField
.
szone
[
1
][
6
]
&&
dField
.
szone
[
1
][
6
]
->
lscale
)
seq
=
6
;
im
.
setTranslation
(
vector3df
((
matManager
.
vFieldSzone
[
1
][
seq
][
0
].
Pos
.
X
+
matManager
.
vFieldSzone
[
1
][
seq
][
1
].
Pos
.
X
)
/
2
,
(
matManager
.
vFieldSzone
[
1
][
seq
][
0
].
Pos
.
Y
+
matManager
.
vFieldSzone
[
1
][
seq
][
2
].
Pos
.
Y
)
/
2
,
0.03
f
));
driver
->
setTransform
(
irr
::
video
::
ETS_WORLD
,
im
);
driver
->
setTransform
(
irr
::
video
::
ETS_WORLD
,
im
);
driver
->
drawVertexPrimitiveList
(
matManager
.
vActivate
,
4
,
matManager
.
iRectangle
,
2
);
driver
->
drawVertexPrimitiveList
(
matManager
.
vActivate
,
4
,
matManager
.
iRectangle
,
2
);
}
}
...
...
gframe/duelclient.cpp
View file @
2217e080
...
@@ -1013,7 +1013,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
...
@@ -1013,7 +1013,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame
->
dField
.
remove_act
=
true
;
mainGame
->
dField
.
remove_act
=
true
;
else
if
(
pcard
->
location
==
LOCATION_EXTRA
)
else
if
(
pcard
->
location
==
LOCATION_EXTRA
)
mainGame
->
dField
.
extra_act
=
true
;
mainGame
->
dField
.
extra_act
=
true
;
else
if
(
pcard
->
location
==
LOCATION_SZONE
&&
pcard
->
sequence
==
6
)
else
if
(
pcard
->
location
==
LOCATION_SZONE
&&
(
pcard
->
sequence
==
0
||
pcard
->
sequence
==
6
)
&&
pcard
->
lscale
)
mainGame
->
dField
.
pzone_act
[
pcard
->
controler
]
=
true
;
mainGame
->
dField
.
pzone_act
[
pcard
->
controler
]
=
true
;
}
}
mainGame
->
dField
.
reposable_cards
.
clear
();
mainGame
->
dField
.
reposable_cards
.
clear
();
...
...
gframe/event_handler.cpp
View file @
2217e080
...
@@ -1769,7 +1769,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
...
@@ -1769,7 +1769,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
myswprintf
(
formatBuffer
,
L"
\n
(%ls)"
,
dataManager
.
GetName
(
mcard
->
alias
));
myswprintf
(
formatBuffer
,
L"
\n
(%ls)"
,
dataManager
.
GetName
(
mcard
->
alias
));
str
.
append
(
formatBuffer
);
str
.
append
(
formatBuffer
);
}
}
if
(
mcard
->
location
==
LOCATION_SZONE
&&
(
mcard
->
sequence
==
6
||
mcard
->
sequence
==
7
)
)
{
if
(
mcard
->
location
==
LOCATION_SZONE
&&
mcard
->
lscale
)
{
myswprintf
(
formatBuffer
,
L"
\n
%d/%d"
,
mcard
->
lscale
,
mcard
->
rscale
);
myswprintf
(
formatBuffer
,
L"
\n
%d/%d"
,
mcard
->
lscale
,
mcard
->
rscale
);
str
.
append
(
formatBuffer
);
str
.
append
(
formatBuffer
);
}
}
...
...
gframe/materials.cpp
View file @
2217e080
...
@@ -23,7 +23,7 @@ Materials::Materials() {
...
@@ -23,7 +23,7 @@ Materials::Materials() {
SetS3DVertex
(
vField
,
-
1.0
f
,
-
4.0
f
,
9.0
f
,
4.0
f
,
0
,
1
,
0
,
0
,
1
,
1
);
SetS3DVertex
(
vField
,
-
1.0
f
,
-
4.0
f
,
9.0
f
,
4.0
f
,
0
,
1
,
0
,
0
,
1
,
1
);
SetS3DVertex
(
vFieldSpell
,
1.2
f
,
-
3.2
f
,
6.7
f
,
3.2
f
,
0
,
1
,
0
,
0
,
1
,
1
);
SetS3DVertex
(
vFieldSpell
,
1.2
f
,
-
3.2
f
,
6.7
f
,
3.2
f
,
0
,
1
,
0
,
0
,
1
,
1
);
SetS3DVertex
(
vFieldSpell1
,
1.2
f
,
0.8
f
,
6.7
f
,
3.2
f
,
0
,
1
,
0
,
0.2
f
,
1
,
0.63636
f
);
SetS3DVertex
(
vFieldSpell1
,
1.2
f
,
0.8
f
,
6.7
f
,
3.2
f
,
0
,
1
,
0
,
0.2
f
,
1
,
0.63636
f
);
SetS3DVertex
(
vFieldSpell2
,
1.2
f
,
-
3.2
f
,
6.7
f
,
-
0.8
f
,
0
,
1
,
0
,
0.63636
f
,
1
,
0.2
f
);
SetS3DVertex
(
vFieldSpell2
,
1.2
f
,
-
3.2
f
,
6.7
f
,
-
0.8
f
,
0
,
1
,
1
,
0.63636
f
,
0
,
0.2
f
);
/*
/*
//background grids
//background grids
...
...
ocgcore
@
8298cf63
Subproject commit
1d378cf927aa2478a41c151b71f4174767e7ad45
Subproject commit
8298cf638bd4a8d0dcd604491b56a3c6560aed03
script
@
d8436e71
Subproject commit
9efd5a6eb49bce77a6b62251a0cf431a69a5ca81
Subproject commit
d8436e71a911d62424fab83a06380ae06b8fca9a
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