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
REIKAI
ygopro
Commits
f641e02e
Commit
f641e02e
authored
Jun 14, 2020
by
nanahira
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'server' of
https://github.com/purerosefallen/ygopro
parents
1cbc8afb
3fb2a2e1
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
404 additions
and
12 deletions
+404
-12
cards.cdb
cards.cdb
+0
-0
gframe/CGUITTFont.cpp
gframe/CGUITTFont.cpp
+6
-4
gframe/deck_manager.cpp
gframe/deck_manager.cpp
+2
-2
gframe/drawing.cpp
gframe/drawing.cpp
+1
-0
gframe/game.cpp
gframe/game.cpp
+1
-1
lflist.conf
lflist.conf
+393
-5
strings.conf
strings.conf
+1
-0
No files found.
cards.cdb
View file @
f641e02e
No preview for this file type
gframe/CGUITTFont.cpp
View file @
f641e02e
...
@@ -153,10 +153,12 @@ void SGUITTGlyph::preload(u32 char_index, FT_Face face, video::IVideoDriver* dri
...
@@ -153,10 +153,12 @@ void SGUITTGlyph::preload(u32 char_index, FT_Face face, video::IVideoDriver* dri
}
}
glyph_page
=
parent
->
getLastGlyphPageIndex
();
glyph_page
=
parent
->
getLastGlyphPageIndex
();
u32
texture_side_length
=
page
->
texture_size
.
Width
;
u32
texture_side_length
=
page
->
texture_size
.
Width
-
font_size
;
u32
margin
=
font_size
*
0.5
;
u32
sprite_size
=
font_size
*
1.5
;
core
::
vector2di
page_position
(
core
::
vector2di
page_position
(
(
page
->
used_slots
%
(
texture_side_length
/
font_size
))
*
font_size
,
(
s32
)(
page
->
used_slots
%
(
s32
)(
texture_side_length
/
sprite_size
))
*
sprite_size
+
margin
,
(
page
->
used_slots
/
(
texture_side_length
/
font_size
))
*
font_size
(
s32
)(
page
->
used_slots
/
(
s32
)(
texture_side_length
/
sprite_size
))
*
sprite_size
+
margin
);
);
source_rect
.
UpperLeftCorner
=
page_position
;
source_rect
.
UpperLeftCorner
=
page_position
;
source_rect
.
LowerRightCorner
=
core
::
vector2di
(
page_position
.
X
+
bits
.
width
,
page_position
.
Y
+
bits
.
rows
);
source_rect
.
LowerRightCorner
=
core
::
vector2di
(
page_position
.
X
+
bits
.
width
,
page_position
.
Y
+
bits
.
rows
);
...
@@ -466,7 +468,7 @@ CGUITTGlyphPage* CGUITTFont::createGlyphPage(const u8& pixel_mode) {
...
@@ -466,7 +468,7 @@ CGUITTGlyphPage* CGUITTFont::createGlyphPage(const u8& pixel_mode) {
if
(
page
)
{
if
(
page
)
{
// Determine the number of glyph slots on the page and add it to the list of pages.
// Determine the number of glyph slots on the page and add it to the list of pages.
page
->
available_slots
=
(
page_texture_size
.
Width
/
size
)
*
(
page_texture_size
.
Height
/
size
);
page
->
available_slots
=
(
u32
)((
page_texture_size
.
Width
-
size
)
/
(
u32
)(
size
*
1.5
))
*
(
u32
)((
page_texture_size
.
Height
-
size
)
/
(
u32
)(
size
*
1.5
)
);
Glyph_Pages
.
push_back
(
page
);
Glyph_Pages
.
push_back
(
page
);
}
}
return
page
;
return
page
;
...
...
gframe/deck_manager.cpp
View file @
f641e02e
...
@@ -81,9 +81,9 @@ int DeckManager::CheckDeck(Deck& deck, int lfhash, bool allow_ocg, bool allow_tc
...
@@ -81,9 +81,9 @@ int DeckManager::CheckDeck(Deck& deck, int lfhash, bool allow_ocg, bool allow_tc
#ifdef YGOPRO_SERVER_MODE
#ifdef YGOPRO_SERVER_MODE
if
(
deck
.
main
.
size
()
<
DECKCOUNT_MAIN_MIN
||
deck
.
main
.
size
()
>
DECKCOUNT_MAIN_MAX
)
if
(
deck
.
main
.
size
()
<
DECKCOUNT_MAIN_MIN
||
deck
.
main
.
size
()
>
DECKCOUNT_MAIN_MAX
)
return
(
DECKERROR_MAINCOUNT
<<
28
)
+
deck
.
main
.
size
();
return
(
DECKERROR_MAINCOUNT
<<
28
)
+
deck
.
main
.
size
();
if
(
deck
.
extra
.
size
()
>
DECKCOUNT_
SIDE
)
if
(
deck
.
extra
.
size
()
>
DECKCOUNT_
EXTRA
)
return
(
DECKERROR_EXTRACOUNT
<<
28
)
+
deck
.
extra
.
size
();
return
(
DECKERROR_EXTRACOUNT
<<
28
)
+
deck
.
extra
.
size
();
if
(
deck
.
side
.
size
()
>
DECKCOUNT_
EXTRA
)
if
(
deck
.
side
.
size
()
>
DECKCOUNT_
SIDE
)
return
(
DECKERROR_SIDECOUNT
<<
28
)
+
deck
.
side
.
size
();
return
(
DECKERROR_SIDECOUNT
<<
28
)
+
deck
.
side
.
size
();
#else
#else
if
(
deck
.
main
.
size
()
<
40
||
deck
.
main
.
size
()
>
60
)
if
(
deck
.
main
.
size
()
<
40
||
deck
.
main
.
size
()
>
60
)
...
...
gframe/drawing.cpp
View file @
f641e02e
...
@@ -1069,6 +1069,7 @@ void Game::ShowElement(irr::gui::IGUIElement * win, int autoframe) {
...
@@ -1069,6 +1069,7 @@ void Game::ShowElement(irr::gui::IGUIElement * win, int autoframe) {
btnCardDisplay
[
i
]
->
setDrawImage
(
false
);
btnCardDisplay
[
i
]
->
setDrawImage
(
false
);
}
}
win
->
setRelativePosition
(
irr
::
core
::
recti
(
center
.
X
,
center
.
Y
,
0
,
0
));
win
->
setRelativePosition
(
irr
::
core
::
recti
(
center
.
X
,
center
.
Y
,
0
,
0
));
win
->
setVisible
(
true
);
fadingList
.
push_back
(
fu
);
fadingList
.
push_back
(
fu
);
}
}
void
Game
::
HideElement
(
irr
::
gui
::
IGUIElement
*
win
,
bool
set_action
)
{
void
Game
::
HideElement
(
irr
::
gui
::
IGUIElement
*
win
,
bool
set_action
)
{
...
...
gframe/game.cpp
View file @
f641e02e
...
@@ -150,7 +150,7 @@ bool Game::Initialize() {
...
@@ -150,7 +150,7 @@ bool Game::Initialize() {
SetWindowsIcon
();
SetWindowsIcon
();
//main menu
//main menu
wchar_t
strbuf
[
256
];
wchar_t
strbuf
[
256
];
myswprintf
(
strbuf
,
L"KoishiPro %X.0%X.%X
Latitude
"
,
PRO_VERSION
>>
12
,
(
PRO_VERSION
>>
4
)
&
0xff
,
PRO_VERSION
&
0xf
);
myswprintf
(
strbuf
,
L"KoishiPro %X.0%X.%X
Doppelganger
"
,
PRO_VERSION
>>
12
,
(
PRO_VERSION
>>
4
)
&
0xff
,
PRO_VERSION
&
0xf
);
wMainMenu
=
env
->
addWindow
(
rect
<
s32
>
(
370
,
200
,
650
,
415
),
false
,
strbuf
);
wMainMenu
=
env
->
addWindow
(
rect
<
s32
>
(
370
,
200
,
650
,
415
),
false
,
strbuf
);
wMainMenu
->
getCloseButton
()
->
setVisible
(
false
);
wMainMenu
->
getCloseButton
()
->
setVisible
(
false
);
btnLanMode
=
env
->
addButton
(
rect
<
s32
>
(
10
,
30
,
270
,
60
),
wMainMenu
,
BUTTON_LAN_MODE
,
dataManager
.
GetSysString
(
1200
));
btnLanMode
=
env
->
addButton
(
rect
<
s32
>
(
10
,
30
,
270
,
60
),
wMainMenu
,
BUTTON_LAN_MODE
,
dataManager
.
GetSysString
(
1200
));
...
...
lflist.conf
View file @
f641e02e
This diff is collapsed.
Click to expand it.
strings.conf
View file @
f641e02e
...
@@ -657,6 +657,7 @@
...
@@ -657,6 +657,7 @@
!
setname
0
x12
青蛙 ガエル
!
setname
0
x12
青蛙 ガエル
!
setname
0
x13
机皇 機皇
!
setname
0
x13
机皇 機皇
!
setname
0
x3013
机皇帝 機皇帝
!
setname
0
x3013
机皇帝 機皇帝
!
setname
0
x5013
机皇神 機皇神
!
setname
0
x6013
机皇兵 機皇兵
!
setname
0
x6013
机皇兵 機皇兵
#setname 0x14 N/A
#setname 0x14 N/A
!
setname
0
x15
巨大战舰 巨大戦艦
!
setname
0
x15
巨大战舰 巨大戦艦
...
...
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