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
5e90b8dc
Commit
5e90b8dc
authored
Dec 16, 2014
by
Argon.Sun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
warning
parent
482fd825
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
14 deletions
+14
-14
gframe/menu_handler.cpp
gframe/menu_handler.cpp
+1
-1
ocgcore/field.cpp
ocgcore/field.cpp
+7
-7
ocgcore/libduel.cpp
ocgcore/libduel.cpp
+1
-1
ocgcore/operations.cpp
ocgcore/operations.cpp
+5
-5
No files found.
gframe/menu_handler.cpp
View file @
5e90b8dc
...
...
@@ -54,7 +54,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
inet_ntop
(
AF_INET
,
&
(((
struct
sockaddr_in
*
)
servinfo
->
ai_addr
)
->
sin_addr
),
ip
,
20
);
freeaddrinfo
(
servinfo
);
#else
int
status
;
//
int status;
char
hostname
[
100
];
char
ip
[
20
];
const
wchar_t
*
pstr
=
mainGame
->
ebJoinIP
->
getText
();
...
...
ocgcore/field.cpp
View file @
5e90b8dc
...
...
@@ -1195,7 +1195,7 @@ int32 field::get_summon_release_list(card* target, card_set* release_list, card_
rcount
+=
pcard
->
operation_param
;
}
}
int32
ex_sum_max
=
0
;
u
int32
ex_sum_max
=
0
;
for
(
int
i
=
0
;
i
<
5
;
++
i
)
{
pcard
=
player
[
1
-
p
].
list_mzone
[
i
];
if
(
!
(
pcard
&&
pcard
->
is_releasable_by_summon
(
p
,
target
)))
...
...
@@ -1298,7 +1298,7 @@ void field::get_xyz_material(card* scard, int32 findex, uint32 lv, int32 maxc) {
}
if
(
core
.
global_flag
&
GLOBALFLAG_XMAT_COUNT_LIMIT
)
{
auto
iter
=
core
.
xmaterial_lst
.
begin
();
while
((
iter
!=
core
.
xmaterial_lst
.
end
())
&&
((
iter
->
first
>
core
.
xmaterial_lst
.
size
())
||
(
iter
->
first
>
maxc
)))
while
((
iter
!=
core
.
xmaterial_lst
.
end
())
&&
((
iter
->
first
>
(
int32
)
core
.
xmaterial_lst
.
size
())
||
(
iter
->
first
>
maxc
)))
core
.
xmaterial_lst
.
erase
(
iter
++
);
}
}
...
...
@@ -1711,12 +1711,12 @@ int32 field::check_xyz_material(card* scard, int32 findex, int32 lv, int32 min,
}
if
(
core
.
global_flag
&
GLOBALFLAG_XMAT_COUNT_LIMIT
)
{
auto
iter
=
core
.
xmaterial_lst
.
begin
();
while
((
iter
!=
core
.
xmaterial_lst
.
end
())
&&
((
iter
->
first
>
core
.
xmaterial_lst
.
size
())
||
(
iter
->
first
>
max
)))
while
((
iter
!=
core
.
xmaterial_lst
.
end
())
&&
((
iter
->
first
>
(
int32
)
core
.
xmaterial_lst
.
size
())
||
(
iter
->
first
>
max
)))
core
.
xmaterial_lst
.
erase
(
iter
++
);
}
}
else
get_xyz_material
(
scard
,
findex
,
lv
,
max
);
return
core
.
xmaterial_lst
.
size
()
>=
min
;
return
(
int32
)
core
.
xmaterial_lst
.
size
()
>=
min
;
}
int32
field
::
is_player_can_draw
(
uint8
playerid
)
{
return
!
is_player_affected_by_effect
(
playerid
,
EFFECT_CANNOT_DRAW
);
...
...
@@ -1915,7 +1915,7 @@ int32 field::is_player_can_summon_count(uint8 playerid, uint32 count) {
pduel
->
lua
->
add_param
(
core
.
reason_effect
,
PARAM_TYPE_EFFECT
);
pduel
->
lua
->
add_param
(
playerid
,
PARAM_TYPE_INT
);
int32
v
=
eset
[
i
]
->
get_value
(
2
);
if
(
v
<
count
)
if
(
v
<
(
int32
)
count
)
return
FALSE
;
}
return
TRUE
;
...
...
@@ -1927,7 +1927,7 @@ int32 field::is_player_can_spsummon_count(uint8 playerid, uint32 count) {
pduel
->
lua
->
add_param
(
core
.
reason_effect
,
PARAM_TYPE_EFFECT
);
pduel
->
lua
->
add_param
(
playerid
,
PARAM_TYPE_INT
);
int32
v
=
eset
[
i
]
->
get_value
(
2
);
if
(
v
<
count
)
if
(
v
<
(
int32
)
count
)
return
FALSE
;
}
return
TRUE
;
...
...
@@ -1939,7 +1939,7 @@ int32 field::is_player_can_flipsummon_count(uint8 playerid, uint32 count) {
pduel
->
lua
->
add_param
(
core
.
reason_effect
,
PARAM_TYPE_EFFECT
);
pduel
->
lua
->
add_param
(
playerid
,
PARAM_TYPE_INT
);
int32
v
=
eset
[
i
]
->
get_value
(
2
);
if
(
v
<
count
)
if
(
v
<
(
int32
)
count
)
return
FALSE
;
}
return
TRUE
;
...
...
ocgcore/libduel.cpp
View file @
5e90b8dc
...
...
@@ -853,7 +853,7 @@ int32 scriptlib::duel_is_environment(lua_State *L) {
pduel
->
game_field
->
filter_field_effect
(
EFFECT_CHANGE_ENVIRONMENT
,
&
eset
);
if
(
eset
.
count
)
{
effect
*
peffect
=
eset
.
get_last
();
if
(
code
==
peffect
->
get_value
()
&&
(
playerid
==
peffect
->
get_handler_player
()
||
playerid
==
PLAYER_ALL
))
if
(
code
==
(
uint32
)
peffect
->
get_value
()
&&
(
playerid
==
peffect
->
get_handler_player
()
||
playerid
==
PLAYER_ALL
))
ret
=
1
;
}
}
...
...
ocgcore/operations.cpp
View file @
5e90b8dc
...
...
@@ -1318,7 +1318,7 @@ int32 field::summon(uint16 step, uint8 sumplayer, card * target, effect * proc,
core
.
temp_var
[
0
]
=
(
ptr
)
pextra
;
if
((
pextra
->
flag
&
EFFECT_FLAG_FUNC_VALUE
)
&&
(
core
.
summon_count
[
sumplayer
]
<
get_summon_count_limit
(
sumplayer
)))
add_process
(
PROCESSOR_SELECT_YESNO
,
0
,
0
,
0
,
sumplayer
,
91
);
else
if
(
!
(
pextra
->
flag
&
EFFECT_FLAG_FUNC_VALUE
)
&&
target
->
material_cards
.
size
()
<
pextra
->
get_value
(
))
else
if
(
!
(
pextra
->
flag
&
EFFECT_FLAG_FUNC_VALUE
)
&&
((
int32
)
target
->
material_cards
.
size
()
<
pextra
->
get_value
()
))
core
.
temp_var
[
0
]
=
0
;
else
returns
.
ivalue
[
0
]
=
TRUE
;
...
...
@@ -1741,7 +1741,7 @@ int32 field::mset(uint16 step, uint8 setplayer, card * target, effect * proc, ui
core
.
temp_var
[
0
]
=
(
ptr
)
pextra
;
if
((
pextra
->
flag
&
EFFECT_FLAG_FUNC_VALUE
)
&&
(
core
.
summon_count
[
setplayer
]
<
get_summon_count_limit
(
setplayer
)))
add_process
(
PROCESSOR_SELECT_YESNO
,
0
,
0
,
0
,
setplayer
,
91
);
else
if
(
!
(
pextra
->
flag
&
EFFECT_FLAG_FUNC_VALUE
)
&&
target
->
material_cards
.
size
()
<
pextra
->
get_value
(
))
else
if
(
!
(
pextra
->
flag
&
EFFECT_FLAG_FUNC_VALUE
)
&&
((
int32
)
target
->
material_cards
.
size
()
<
pextra
->
get_value
()
))
core
.
temp_var
[
0
]
=
0
;
else
returns
.
ivalue
[
0
]
=
TRUE
;
...
...
@@ -4177,7 +4177,7 @@ int32 field::select_xyz_material(int16 step, uint8 playerid, uint32 lv, card* sc
case
3
:
{
card
*
pcard
=
core
.
select_cards
[
returns
.
bvalue
[
1
]];
core
.
operated_set
.
insert
(
pcard
);
int
pv
=
0
;
int
32
pv
=
0
;
for
(
auto
iter
=
core
.
xmaterial_lst
.
begin
();
iter
!=
core
.
xmaterial_lst
.
end
();
++
iter
)
{
if
(
iter
->
second
==
pcard
)
{
pv
=
iter
->
first
;
...
...
@@ -4193,7 +4193,7 @@ int32 field::select_xyz_material(int16 step, uint8 playerid, uint32 lv, card* sc
pduel
->
lua
->
add_param
(
pgroup
,
PARAM_TYPE_GROUP
);
return
TRUE
;
}
if
(
min
+
core
.
operated_set
.
size
()
<
pv
)
if
(
min
+
(
int32
)
core
.
operated_set
.
size
()
<
pv
)
min
=
pv
-
core
.
operated_set
.
size
();
core
.
units
.
begin
()
->
arg2
=
min
+
(
max
<<
16
);
if
(
min
==
0
)
{
...
...
@@ -4218,7 +4218,7 @@ int32 field::select_xyz_material(int16 step, uint8 playerid, uint32 lv, card* sc
pduel
->
write_buffer8
(
HINT_SELECTMSG
);
pduel
->
write_buffer8
(
playerid
);
pduel
->
write_buffer32
(
513
);
if
(
min
+
core
.
operated_set
.
size
()
>=
maxv
)
if
(
min
+
(
int32
)
core
.
operated_set
.
size
()
>=
maxv
)
add_process
(
PROCESSOR_SELECT_CARD
,
0
,
0
,
0
,
playerid
,
min
+
(
max
<<
16
));
else
{
add_process
(
PROCESSOR_SELECT_CARD
,
0
,
0
,
0
,
playerid
,
0x10001
);
...
...
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