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
baichixing
ygopro
Commits
60825c6c
Commit
60825c6c
authored
Aug 10, 2017
by
mercury233
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
format
parent
e673099b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
11 deletions
+6
-11
gframe/CGUITTFont.cpp
gframe/CGUITTFont.cpp
+2
-2
gframe/CGUITTFont.h
gframe/CGUITTFont.h
+2
-3
gframe/deck_con.cpp
gframe/deck_con.cpp
+1
-5
gframe/game.cpp
gframe/game.cpp
+1
-1
No files found.
gframe/CGUITTFont.cpp
View file @
60825c6c
...
@@ -443,8 +443,8 @@ CGUITTGlyphPage* CGUITTFont::createGlyphPage(const u8& pixel_mode) {
...
@@ -443,8 +443,8 @@ CGUITTGlyphPage* CGUITTFont::createGlyphPage(const u8& pixel_mode) {
if
(
page_texture_size
.
Width
>
max_texture_size
.
Width
||
page_texture_size
.
Height
>
max_texture_size
.
Height
)
if
(
page_texture_size
.
Width
>
max_texture_size
.
Width
||
page_texture_size
.
Height
>
max_texture_size
.
Height
)
page_texture_size
=
max_texture_size
;
page_texture_size
=
max_texture_size
;
page
->
texture_size
=
page_texture_size
;
page
->
texture_size
=
page_texture_size
;
page
->
pixel_mode
=
pixel_mode
;
page
->
pixel_mode
=
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.
...
...
gframe/CGUITTFont.h
View file @
60825c6c
...
@@ -143,12 +143,11 @@ public:
...
@@ -143,12 +143,11 @@ public:
void
updateTexture
()
{
void
updateTexture
()
{
if
(
!
dirty
)
return
;
if
(
!
dirty
)
return
;
if
(
!
texture
)
if
(
!
texture
)
{
{
if
(
!
createPageTexture
(
pixel_mode
,
texture_size
))
if
(
!
createPageTexture
(
pixel_mode
,
texture_size
))
// TODO: add error message?
// TODO: add error message?
return
;
return
;
}
}
void
*
ptr
=
texture
->
lock
();
void
*
ptr
=
texture
->
lock
();
video
::
ECOLOR_FORMAT
format
=
texture
->
getColorFormat
();
video
::
ECOLOR_FORMAT
format
=
texture
->
getColorFormat
();
...
...
gframe/deck_con.cpp
View file @
60825c6c
...
@@ -224,11 +224,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -224,11 +224,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
mainGame
->
env
->
addMessageBox
(
L""
,
dataManager
.
GetSysString
(
1410
));
mainGame
->
env
->
addMessageBox
(
L""
,
dataManager
.
GetSysString
(
1410
));
break
;
break
;
}
}
mainGame
->
imgCard
->
setImage
(
imageManager
.
tCover
[
0
]);
// clear imgCard
mainGame
->
imgCard
->
setImage
(
imageManager
.
tCover
[
0
]);
// send result to server
char
deckbuf
[
1024
];
char
deckbuf
[
1024
];
char
*
pdeck
=
deckbuf
;
char
*
pdeck
=
deckbuf
;
BufferIO
::
WriteInt32
(
pdeck
,
deckManager
.
current_deck
.
main
.
size
()
+
deckManager
.
current_deck
.
extra
.
size
());
BufferIO
::
WriteInt32
(
pdeck
,
deckManager
.
current_deck
.
main
.
size
()
+
deckManager
.
current_deck
.
extra
.
size
());
...
...
gframe/game.cpp
View file @
60825c6c
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
#include <dirent.h>
#include <dirent.h>
#endif
#endif
const
unsigned
short
PRO_VERSION
=
0x
133D
;
const
unsigned
short
PRO_VERSION
=
0x
233C
;
namespace
ygo
{
namespace
ygo
{
...
...
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