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
056c85f2
Commit
056c85f2
authored
Jan 29, 2014
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
e1b3a450
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
0 deletions
+6
-0
gframe/event_handler.cpp
gframe/event_handler.cpp
+4
-0
ocgcore/operations.cpp
ocgcore/operations.cpp
+1
-0
strings.conf
strings.conf
+1
-0
No files found.
gframe/event_handler.cpp
View file @
056c85f2
...
@@ -1634,6 +1634,10 @@ void ClientField::ShowMenu(int flag, int x, int y) {
...
@@ -1634,6 +1634,10 @@ void ClientField::ShowMenu(int flag, int x, int y) {
height
+=
21
;
height
+=
21
;
}
else
mainGame
->
btnMSet
->
setVisible
(
false
);
}
else
mainGame
->
btnMSet
->
setVisible
(
false
);
if
(
flag
&
COMMAND_SSET
)
{
if
(
flag
&
COMMAND_SSET
)
{
if
(
!
(
clicked_card
->
type
&
TYPE_MONSTER
))
mainGame
->
btnSSet
->
setText
(
dataManager
.
GetSysString
(
1153
));
else
mainGame
->
btnSSet
->
setText
(
dataManager
.
GetSysString
(
1159
));
mainGame
->
btnSSet
->
setVisible
(
true
);
mainGame
->
btnSSet
->
setVisible
(
true
);
mainGame
->
btnSSet
->
setRelativePosition
(
position2di
(
1
,
height
));
mainGame
->
btnSSet
->
setRelativePosition
(
position2di
(
1
,
height
));
height
+=
21
;
height
+=
21
;
...
...
ocgcore/operations.cpp
View file @
056c85f2
...
@@ -2779,6 +2779,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
...
@@ -2779,6 +2779,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
pcard
->
current
.
reason
&=
~
REASON_TEMPORARY
;
pcard
->
current
.
reason
&=
~
REASON_TEMPORARY
;
pcard
->
fieldid
=
infos
.
field_id
++
;
pcard
->
fieldid
=
infos
.
field_id
++
;
pcard
->
reset
(
RESET_LEAVE
,
RESET_EVENT
);
pcard
->
reset
(
RESET_LEAVE
,
RESET_EVENT
);
pcard
->
relate_effect
.
clear
();
remove_card
(
pcard
);
remove_card
(
pcard
);
leave
.
insert
(
pcard
);
leave
.
insert
(
pcard
);
continue
;
continue
;
...
...
strings.conf
View file @
056c85f2
...
@@ -208,6 +208,7 @@
...
@@ -208,6 +208,7 @@
!
system
1156
攻击表示
!
system
1156
攻击表示
!
system
1157
攻击
!
system
1157
攻击
!
system
1158
查看列表
!
system
1158
查看列表
!
system
1159
放置
#menu
#menu
!
system
1200
联机模式
!
system
1200
联机模式
!
system
1201
单人模式
!
system
1201
单人模式
...
...
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