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
27e06722
Commit
27e06722
authored
May 03, 2023
by
mercury233
Committed by
GitHub
May 03, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add RACE_ILLUSION, RACES_COUNT (#2494)
parent
da8bfaf2
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
6 deletions
+7
-6
gframe/data_manager.cpp
gframe/data_manager.cpp
+1
-1
gframe/duelclient.cpp
gframe/duelclient.cpp
+1
-1
gframe/event_handler.cpp
gframe/event_handler.cpp
+1
-1
gframe/game.cpp
gframe/game.cpp
+2
-2
gframe/game.h
gframe/game.h
+1
-1
strings.conf
strings.conf
+1
-0
No files found.
gframe/data_manager.cpp
View file @
27e06722
...
@@ -279,7 +279,7 @@ const wchar_t* DataManager::FormatRace(int race) {
...
@@ -279,7 +279,7 @@ const wchar_t* DataManager::FormatRace(int race) {
wchar_t
*
p
=
racBuffer
;
wchar_t
*
p
=
racBuffer
;
unsigned
filter
=
1
;
unsigned
filter
=
1
;
int
i
=
1020
;
int
i
=
1020
;
for
(;
filter
!=
0x2000000
;
filter
<<=
1
,
++
i
)
{
for
(;
filter
<
(
1
<<
RACES_COUNT
)
;
filter
<<=
1
,
++
i
)
{
if
(
race
&
filter
)
{
if
(
race
&
filter
)
{
BufferIO
::
CopyWStrRef
(
GetSysString
(
i
),
p
,
16
);
BufferIO
::
CopyWStrRef
(
GetSysString
(
i
),
p
,
16
);
*
p
=
L'|'
;
*
p
=
L'|'
;
...
...
gframe/duelclient.cpp
View file @
27e06722
...
@@ -3522,7 +3522,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
...
@@ -3522,7 +3522,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
/*int player = */
mainGame
->
LocalPlayer
(
BufferIO
::
ReadInt8
(
pbuf
));
/*int player = */
mainGame
->
LocalPlayer
(
BufferIO
::
ReadInt8
(
pbuf
));
mainGame
->
dField
.
announce_count
=
BufferIO
::
ReadInt8
(
pbuf
);
mainGame
->
dField
.
announce_count
=
BufferIO
::
ReadInt8
(
pbuf
);
int
available
=
BufferIO
::
ReadInt32
(
pbuf
);
int
available
=
BufferIO
::
ReadInt32
(
pbuf
);
for
(
int
i
=
0
,
filter
=
0x1
;
i
<
25
;
++
i
,
filter
<<=
1
)
{
for
(
int
i
=
0
,
filter
=
0x1
;
i
<
RACES_COUNT
;
++
i
,
filter
<<=
1
)
{
mainGame
->
chkRace
[
i
]
->
setChecked
(
false
);
mainGame
->
chkRace
[
i
]
->
setChecked
(
false
);
if
(
filter
&
available
)
if
(
filter
&
available
)
mainGame
->
chkRace
[
i
]
->
setVisible
(
true
);
mainGame
->
chkRace
[
i
]
->
setVisible
(
true
);
...
...
gframe/event_handler.cpp
View file @
27e06722
...
@@ -837,7 +837,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
...
@@ -837,7 +837,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
}
}
case
CHECK_RACE
:
{
case
CHECK_RACE
:
{
int
rac
=
0
,
filter
=
0x1
,
count
=
0
;
int
rac
=
0
,
filter
=
0x1
,
count
=
0
;
for
(
int
i
=
0
;
i
<
25
;
++
i
,
filter
<<=
1
)
{
for
(
int
i
=
0
;
i
<
RACES_COUNT
;
++
i
,
filter
<<=
1
)
{
if
(
mainGame
->
chkRace
[
i
]
->
isChecked
())
{
if
(
mainGame
->
chkRace
[
i
]
->
isChecked
())
{
rac
|=
filter
;
rac
|=
filter
;
count
++
;
count
++
;
...
...
gframe/game.cpp
View file @
27e06722
...
@@ -583,7 +583,7 @@ bool Game::Initialize() {
...
@@ -583,7 +583,7 @@ bool Game::Initialize() {
wANRace
=
env
->
addWindow
(
rect
<
s32
>
(
480
,
200
,
850
,
410
),
false
,
dataManager
.
GetSysString
(
563
));
wANRace
=
env
->
addWindow
(
rect
<
s32
>
(
480
,
200
,
850
,
410
),
false
,
dataManager
.
GetSysString
(
563
));
wANRace
->
getCloseButton
()
->
setVisible
(
false
);
wANRace
->
getCloseButton
()
->
setVisible
(
false
);
wANRace
->
setVisible
(
false
);
wANRace
->
setVisible
(
false
);
for
(
int
filter
=
0x1
,
i
=
0
;
i
<
25
;
filter
<<=
1
,
++
i
)
for
(
int
filter
=
0x1
,
i
=
0
;
i
<
RACES_COUNT
;
filter
<<=
1
,
++
i
)
chkRace
[
i
]
=
env
->
addCheckBox
(
false
,
rect
<
s32
>
(
10
+
(
i
%
4
)
*
90
,
25
+
(
i
/
4
)
*
25
,
100
+
(
i
%
4
)
*
90
,
50
+
(
i
/
4
)
*
25
),
chkRace
[
i
]
=
env
->
addCheckBox
(
false
,
rect
<
s32
>
(
10
+
(
i
%
4
)
*
90
,
25
+
(
i
/
4
)
*
25
,
100
+
(
i
%
4
)
*
90
,
50
+
(
i
/
4
)
*
25
),
wANRace
,
CHECK_RACE
,
dataManager
.
FormatRace
(
filter
));
wANRace
,
CHECK_RACE
,
dataManager
.
FormatRace
(
filter
));
//selection hint
//selection hint
...
@@ -720,7 +720,7 @@ bool Game::Initialize() {
...
@@ -720,7 +720,7 @@ bool Game::Initialize() {
cbRace
=
env
->
addComboBox
(
rect
<
s32
>
(
60
,
40
+
75
/
6
,
190
,
60
+
75
/
6
),
wFilter
,
COMBOBOX_RACE
);
cbRace
=
env
->
addComboBox
(
rect
<
s32
>
(
60
,
40
+
75
/
6
,
190
,
60
+
75
/
6
),
wFilter
,
COMBOBOX_RACE
);
cbRace
->
setMaxSelectionRows
(
10
);
cbRace
->
setMaxSelectionRows
(
10
);
cbRace
->
addItem
(
dataManager
.
GetSysString
(
1310
),
0
);
cbRace
->
addItem
(
dataManager
.
GetSysString
(
1310
),
0
);
for
(
int
filter
=
0x1
;
filter
!=
0x2000000
;
filter
<<=
1
)
for
(
int
filter
=
0x1
;
filter
<
(
1
<<
RACES_COUNT
)
;
filter
<<=
1
)
cbRace
->
addItem
(
dataManager
.
FormatRace
(
filter
),
filter
);
cbRace
->
addItem
(
dataManager
.
FormatRace
(
filter
),
filter
);
stAttack
=
env
->
addStaticText
(
dataManager
.
GetSysString
(
1322
),
rect
<
s32
>
(
205
,
22
+
50
/
6
,
280
,
42
+
50
/
6
),
false
,
false
,
wFilter
);
stAttack
=
env
->
addStaticText
(
dataManager
.
GetSysString
(
1322
),
rect
<
s32
>
(
205
,
22
+
50
/
6
,
280
,
42
+
50
/
6
),
false
,
false
,
wFilter
);
ebAttack
=
env
->
addEditBox
(
L""
,
rect
<
s32
>
(
260
,
20
+
50
/
6
,
340
,
40
+
50
/
6
),
true
,
wFilter
,
EDITBOX_INPUTS
);
ebAttack
=
env
->
addEditBox
(
L""
,
rect
<
s32
>
(
260
,
20
+
50
/
6
,
340
,
40
+
50
/
6
),
true
,
wFilter
,
EDITBOX_INPUTS
);
...
...
gframe/game.h
View file @
27e06722
...
@@ -456,7 +456,7 @@ public:
...
@@ -456,7 +456,7 @@ public:
irr
::
gui
::
IGUICheckBox
*
chkAttribute
[
7
];
irr
::
gui
::
IGUICheckBox
*
chkAttribute
[
7
];
//announce race
//announce race
irr
::
gui
::
IGUIWindow
*
wANRace
;
irr
::
gui
::
IGUIWindow
*
wANRace
;
irr
::
gui
::
IGUICheckBox
*
chkRace
[
25
];
irr
::
gui
::
IGUICheckBox
*
chkRace
[
RACES_COUNT
];
//cmd menu
//cmd menu
irr
::
gui
::
IGUIWindow
*
wCmdMenu
;
irr
::
gui
::
IGUIWindow
*
wCmdMenu
;
irr
::
gui
::
IGUIButton
*
btnActivate
;
irr
::
gui
::
IGUIButton
*
btnActivate
;
...
...
strings.conf
View file @
27e06722
...
@@ -181,6 +181,7 @@
...
@@ -181,6 +181,7 @@
!
system
1042
创造神
!
system
1042
创造神
!
system
1043
幻龙
!
system
1043
幻龙
!
system
1044
电子界
!
system
1044
电子界
!
system
1045
幻想魔
!
system
1050
怪兽
!
system
1050
怪兽
!
system
1051
魔法
!
system
1051
魔法
!
system
1052
陷阱
!
system
1052
陷阱
...
...
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