Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-core
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-core
Commits
a522ebbb
Commit
a522ebbb
authored
Oct 05, 2024
by
Chen Bill
Committed by
GitHub
Oct 05, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix function name (#638)
parent
2dbc9d75
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
effect.cpp
effect.cpp
+3
-3
effect.h
effect.h
+1
-1
No files found.
effect.cpp
View file @
a522ebbb
...
@@ -12,8 +12,8 @@
...
@@ -12,8 +12,8 @@
#include "interpreter.h"
#include "interpreter.h"
bool
effect_sort_id
(
const
effect
*
e1
,
const
effect
*
e2
)
{
bool
effect_sort_id
(
const
effect
*
e1
,
const
effect
*
e2
)
{
int32
is_single1
=
e1
->
is_ini
it
al_single
();
int32
is_single1
=
e1
->
is_ini
ti
al_single
();
int32
is_single2
=
e2
->
is_ini
it
al_single
();
int32
is_single2
=
e2
->
is_ini
ti
al_single
();
if
(
is_single1
!=
is_single2
)
if
(
is_single1
!=
is_single2
)
return
is_single1
>
is_single2
;
return
is_single1
>
is_single2
;
return
e1
->
id
<
e2
->
id
;
return
e1
->
id
<
e2
->
id
;
...
@@ -619,7 +619,7 @@ int32 effect::is_chainable(uint8 tp) {
...
@@ -619,7 +619,7 @@ int32 effect::is_chainable(uint8 tp) {
int32
effect
::
is_hand_trigger
()
const
{
int32
effect
::
is_hand_trigger
()
const
{
return
(
range
&
LOCATION_HAND
)
&&
(
type
&
EFFECT_TYPE_TRIGGER_O
)
&&
get_code_type
()
!=
CODE_PHASE
;
return
(
range
&
LOCATION_HAND
)
&&
(
type
&
EFFECT_TYPE_TRIGGER_O
)
&&
get_code_type
()
!=
CODE_PHASE
;
}
}
int32
effect
::
is_ini
it
al_single
()
const
{
int32
effect
::
is_ini
ti
al_single
()
const
{
return
(
type
&
EFFECT_TYPE_SINGLE
)
&&
is_flag
(
EFFECT_FLAG_SINGLE_RANGE
)
&&
is_flag
(
EFFECT_FLAG_INITIAL
);
return
(
type
&
EFFECT_TYPE_SINGLE
)
&&
is_flag
(
EFFECT_FLAG_SINGLE_RANGE
)
&&
is_flag
(
EFFECT_FLAG_INITIAL
);
}
}
//return: this can be reset by reset_level or not
//return: this can be reset by reset_level or not
...
...
effect.h
View file @
a522ebbb
...
@@ -88,7 +88,7 @@ public:
...
@@ -88,7 +88,7 @@ public:
int32
is_immuned
(
card
*
pcard
);
int32
is_immuned
(
card
*
pcard
);
int32
is_chainable
(
uint8
tp
);
int32
is_chainable
(
uint8
tp
);
int32
is_hand_trigger
()
const
;
int32
is_hand_trigger
()
const
;
int32
is_ini
it
al_single
()
const
;
int32
is_ini
ti
al_single
()
const
;
int32
reset
(
uint32
reset_level
,
uint32
reset_type
);
int32
reset
(
uint32
reset_level
,
uint32
reset_type
);
void
dec_count
(
uint8
playerid
=
PLAYER_NONE
);
void
dec_count
(
uint8
playerid
=
PLAYER_NONE
);
void
recharge
();
void
recharge
();
...
...
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