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
d66ac49f
Commit
d66ac49f
authored
Jul 07, 2016
by
DailyShana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix selecting place manually
parent
1bf74487
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
19 deletions
+19
-19
gframe/client_field.h
gframe/client_field.h
+3
-3
gframe/drawing.cpp
gframe/drawing.cpp
+10
-10
gframe/duelclient.cpp
gframe/duelclient.cpp
+1
-1
gframe/event_handler.cpp
gframe/event_handler.cpp
+3
-3
ocgcore
ocgcore
+1
-1
script
script
+1
-1
No files found.
gframe/client_field.h
View file @
d66ac49f
...
...
@@ -45,9 +45,9 @@ public:
size_t
selected_option
;
ClientCard
*
attacker
;
ClientCard
*
attack_target
;
int
disabled_field
;
int
selectable_field
;
int
selected_field
;
unsigned
int
disabled_field
;
unsigned
int
selectable_field
;
unsigned
int
selected_field
;
int
select_min
;
int
select_max
;
int
must_select_count
;
...
...
gframe/drawing.cpp
View file @
d66ac49f
...
...
@@ -105,54 +105,54 @@ void Game::DrawBackGround() {
//select field
if
(
dInfo
.
curMsg
==
MSG_SELECT_PLACE
||
dInfo
.
curMsg
==
MSG_SELECT_DISFIELD
)
{
float
cv
[
4
]
=
{
0.0
f
,
0.0
f
,
1.0
f
,
1.0
f
};
int
filter
=
0x1
;
unsigned
int
filter
=
0x1
;
for
(
int
i
=
0
;
i
<
5
;
++
i
,
filter
<<=
1
)
{
if
(
(
dField
.
selectable_field
&
filter
)
>
0
)
if
(
dField
.
selectable_field
&
filter
)
DrawSelectionLine
(
&
matManager
.
vFields
[
16
+
i
*
4
],
!
(
dField
.
selected_field
&
filter
),
2
,
cv
);
}
filter
=
0x100
;
for
(
int
i
=
0
;
i
<
8
;
++
i
,
filter
<<=
1
)
{
if
(
(
dField
.
selectable_field
&
filter
)
>
0
)
if
(
dField
.
selectable_field
&
filter
)
DrawSelectionLine
(
&
matManager
.
vFields
[
36
+
i
*
4
],
!
(
dField
.
selected_field
&
filter
),
2
,
cv
);
}
filter
=
0x10000
;
for
(
int
i
=
0
;
i
<
5
;
++
i
,
filter
<<=
1
)
{
if
(
(
dField
.
selectable_field
&
filter
)
>
0
)
if
(
dField
.
selectable_field
&
filter
)
DrawSelectionLine
(
&
matManager
.
vFields
[
84
+
i
*
4
],
!
(
dField
.
selected_field
&
filter
),
2
,
cv
);
}
filter
=
0x1000000
;
for
(
int
i
=
0
;
i
<
8
;
++
i
,
filter
<<=
1
)
{
if
(
(
dField
.
selectable_field
&
filter
)
>
0
)
if
(
dField
.
selectable_field
&
filter
)
DrawSelectionLine
(
&
matManager
.
vFields
[
104
+
i
*
4
],
!
(
dField
.
selected_field
&
filter
),
2
,
cv
);
}
}
//disabled field
{
/*float cv[4] = {0.0f, 0.0f, 1.0f, 1.0f};*/
int
filter
=
0x1
;
unsigned
int
filter
=
0x1
;
for
(
int
i
=
0
;
i
<
5
;
++
i
,
filter
<<=
1
)
{
if
(
(
dField
.
disabled_field
&
filter
)
>
0
)
{
if
(
dField
.
disabled_field
&
filter
)
{
driver
->
draw3DLine
(
matManager
.
vFields
[
16
+
i
*
4
].
Pos
,
matManager
.
vFields
[
16
+
i
*
4
+
3
].
Pos
,
0xffffffff
);
driver
->
draw3DLine
(
matManager
.
vFields
[
16
+
i
*
4
+
1
].
Pos
,
matManager
.
vFields
[
16
+
i
*
4
+
2
].
Pos
,
0xffffffff
);
}
}
filter
=
0x100
;
for
(
int
i
=
0
;
i
<
8
;
++
i
,
filter
<<=
1
)
{
if
(
(
dField
.
disabled_field
&
filter
)
>
0
)
{
if
(
dField
.
disabled_field
&
filter
)
{
driver
->
draw3DLine
(
matManager
.
vFields
[
36
+
i
*
4
].
Pos
,
matManager
.
vFields
[
36
+
i
*
4
+
3
].
Pos
,
0xffffffff
);
driver
->
draw3DLine
(
matManager
.
vFields
[
36
+
i
*
4
+
1
].
Pos
,
matManager
.
vFields
[
36
+
i
*
4
+
2
].
Pos
,
0xffffffff
);
}
}
filter
=
0x10000
;
for
(
int
i
=
0
;
i
<
5
;
++
i
,
filter
<<=
1
)
{
if
(
(
dField
.
disabled_field
&
filter
)
>
0
)
{
if
(
dField
.
disabled_field
&
filter
)
{
driver
->
draw3DLine
(
matManager
.
vFields
[
84
+
i
*
4
].
Pos
,
matManager
.
vFields
[
84
+
i
*
4
+
3
].
Pos
,
0xffffffff
);
driver
->
draw3DLine
(
matManager
.
vFields
[
84
+
i
*
4
+
1
].
Pos
,
matManager
.
vFields
[
84
+
i
*
4
+
2
].
Pos
,
0xffffffff
);
}
}
filter
=
0x1000000
;
for
(
int
i
=
0
;
i
<
8
;
++
i
,
filter
<<=
1
)
{
if
(
(
dField
.
disabled_field
&
filter
)
>
0
)
{
if
(
dField
.
disabled_field
&
filter
)
{
driver
->
draw3DLine
(
matManager
.
vFields
[
104
+
i
*
4
].
Pos
,
matManager
.
vFields
[
104
+
i
*
4
+
3
].
Pos
,
0xffffffff
);
driver
->
draw3DLine
(
matManager
.
vFields
[
104
+
i
*
4
+
1
].
Pos
,
matManager
.
vFields
[
104
+
i
*
4
+
2
].
Pos
,
0xffffffff
);
}
...
...
gframe/duelclient.cpp
View file @
d66ac49f
...
...
@@ -1273,7 +1273,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
unsigned
char
respbuf
[
64
];
int
pzone
=
0
;
if
(
mainGame
->
dInfo
.
curMsg
==
MSG_SELECT_PLACE
&&
mainGame
->
chkAutoPos
->
isChecked
())
{
int
filter
;
unsigned
int
filter
;
if
(
mainGame
->
dField
.
selectable_field
&
0x1f
)
{
respbuf
[
0
]
=
mainGame
->
dInfo
.
isFirst
?
0
:
1
;
respbuf
[
1
]
=
0x4
;
...
...
gframe/event_handler.cpp
View file @
d66ac49f
...
...
@@ -1107,9 +1107,9 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case
MSG_SELECT_DISFIELD
:
{
if
(
!
(
hovered_location
&
LOCATION_ONFIELD
)
||
hovered_sequence
==
5
)
break
;
int
flag
=
1
<<
(
hovered_sequence
+
(
hovered_controler
<<
4
)
+
((
hovered_location
==
LOCATION_MZONE
)
?
0
:
8
));
if
(
(
flag
&
selectable_field
)
>
0
)
{
if
(
(
flag
&
selected_field
)
>
0
)
{
unsigned
int
flag
=
1
<<
(
hovered_sequence
+
(
hovered_controler
<<
4
)
+
((
hovered_location
==
LOCATION_MZONE
)
?
0
:
8
));
if
(
flag
&
selectable_field
)
{
if
(
flag
&
selected_field
)
{
selected_field
&=
~
flag
;
select_min
++
;
}
else
{
...
...
ocgcore
@
62ab0c81
Subproject commit
27e0668f9071f58638f4ed50cffdf12f33f59c7b
Subproject commit
62ab0c81d4bd57521148e911776675f084faa785
script
@
16ce4895
Subproject commit
57337f33ecce0ae02a05a861ca7fe77e2c52bac2
Subproject commit
16ce4895cf02438eb598d351fff6ec3f1e94b0ea
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