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
b891f85c
Commit
b891f85c
authored
Feb 20, 2025
by
Chen Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix namespace irr::core
parent
8b374484
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
gframe/config.h
gframe/config.h
+0
-1
gframe/drawing.cpp
gframe/drawing.cpp
+1
-1
gframe/game.cpp
gframe/game.cpp
+2
-2
No files found.
gframe/config.h
View file @
b891f85c
...
@@ -74,7 +74,6 @@ inline FILE* mywfopen(const wchar_t* filename, const char* mode) {
...
@@ -74,7 +74,6 @@ inline FILE* mywfopen(const wchar_t* filename, const char* mode) {
#include <irrlicht.h>
#include <irrlicht.h>
using
namespace
irr
;
using
namespace
irr
;
using
namespace
core
;
extern
const
unsigned
short
PRO_VERSION
;
extern
const
unsigned
short
PRO_VERSION
;
extern
unsigned
int
enable_log
;
extern
unsigned
int
enable_log
;
...
...
gframe/drawing.cpp
View file @
b891f85c
...
@@ -1134,7 +1134,7 @@ void Game::DrawThumb(code_pointer cp, irr::core::vector2di pos, const LFList* lf
...
@@ -1134,7 +1134,7 @@ void Game::DrawThumb(code_pointer cp, irr::core::vector2di pos, const LFList* lf
irr
::
video
::
ITexture
*
img
=
imageManager
.
GetTextureThumb
(
code
);
irr
::
video
::
ITexture
*
img
=
imageManager
.
GetTextureThumb
(
code
);
if
(
img
==
nullptr
)
if
(
img
==
nullptr
)
return
;
//nullptr->getSize() will cause a crash
return
;
//nullptr->getSize() will cause a crash
dimension2d
<
u32
>
size
=
img
->
getOriginalSize
();
irr
::
core
::
dimension2d
<
u32
>
size
=
img
->
getOriginalSize
();
irr
::
core
::
recti
dragloc
=
mainGame
->
Resize
(
pos
.
X
,
pos
.
Y
,
pos
.
X
+
CARD_THUMB_WIDTH
,
pos
.
Y
+
CARD_THUMB_HEIGHT
);
irr
::
core
::
recti
dragloc
=
mainGame
->
Resize
(
pos
.
X
,
pos
.
Y
,
pos
.
X
+
CARD_THUMB_WIDTH
,
pos
.
Y
+
CARD_THUMB_HEIGHT
);
irr
::
core
::
recti
limitloc
=
mainGame
->
Resize
(
pos
.
X
,
pos
.
Y
,
pos
.
X
+
20
,
pos
.
Y
+
20
);
irr
::
core
::
recti
limitloc
=
mainGame
->
Resize
(
pos
.
X
,
pos
.
Y
,
pos
.
X
+
20
,
pos
.
Y
+
20
);
irr
::
core
::
recti
otloc
=
Resize
(
pos
.
X
+
7
,
pos
.
Y
+
50
,
pos
.
X
+
37
,
pos
.
Y
+
65
);
irr
::
core
::
recti
otloc
=
Resize
(
pos
.
X
+
7
,
pos
.
Y
+
50
,
pos
.
X
+
37
,
pos
.
Y
+
65
);
...
...
gframe/game.cpp
View file @
b891f85c
...
@@ -975,7 +975,7 @@ bool Game::Initialize() {
...
@@ -975,7 +975,7 @@ bool Game::Initialize() {
col
.
setAlpha
(
224
);
col
.
setAlpha
(
224
);
env
->
getSkin
()
->
setColor
((
irr
::
gui
::
EGUI_DEFAULT_COLOR
)
i
,
col
);
env
->
getSkin
()
->
setColor
((
irr
::
gui
::
EGUI_DEFAULT_COLOR
)
i
,
col
);
}
}
dimension2du
size
=
driver
->
getScreenSize
();
auto
size
=
driver
->
getScreenSize
();
if
(
window_size
!=
size
)
{
if
(
window_size
!=
size
)
{
window_size
=
size
;
window_size
=
size
;
xScale
=
window_size
.
Width
/
1024.0
;
xScale
=
window_size
.
Width
/
1024.0
;
...
@@ -1002,7 +1002,7 @@ void Game::MainLoop() {
...
@@ -1002,7 +1002,7 @@ void Game::MainLoop() {
int
fps
=
0
;
int
fps
=
0
;
int
cur_time
=
0
;
int
cur_time
=
0
;
while
(
device
->
run
())
{
while
(
device
->
run
())
{
dimension2du
size
=
driver
->
getScreenSize
();
auto
size
=
driver
->
getScreenSize
();
if
(
window_size
!=
size
)
{
if
(
window_size
!=
size
)
{
window_size
=
size
;
window_size
=
size
;
xScale
=
window_size
.
Width
/
1024.0
;
xScale
=
window_size
.
Width
/
1024.0
;
...
...
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