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
nanahira
ygopro
Commits
b05e0c96
Commit
b05e0c96
authored
Oct 08, 2024
by
Chen Bill
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use wcsncpy
parent
6a2deaac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
9 deletions
+18
-9
gframe/gframe.cpp
gframe/gframe.cpp
+14
-7
gframe/menu_handler.cpp
gframe/menu_handler.cpp
+4
-2
No files found.
gframe/gframe.cpp
View file @
b05e0c96
...
...
@@ -115,14 +115,16 @@ int main(int argc, char* argv[]) {
++
i
;
if
(
i
<
wargc
)
{
deckCategorySpecified
=
true
;
wcscpy
(
ygo
::
mainGame
->
gameConf
.
lastcategory
,
wargv
[
i
]);
wcsncpy
(
ygo
::
mainGame
->
gameConf
.
lastcategory
,
wargv
[
i
],
sizeof
ygo
::
mainGame
->
gameConf
.
lastcategory
/
sizeof
ygo
::
mainGame
->
gameConf
.
lastcategory
[
0
]);
BufferIO
::
NullTerminate
(
ygo
::
mainGame
->
gameConf
.
lastcategory
);
}
}
else
if
(
!
wcscmp
(
wargv
[
i
],
L"-d"
))
{
// Deck
++
i
;
if
(
!
deckCategorySpecified
)
ygo
::
mainGame
->
gameConf
.
lastcategory
[
0
]
=
0
;
if
(
i
+
1
<
wargc
)
{
// select deck
wcscpy
(
ygo
::
mainGame
->
gameConf
.
lastdeck
,
wargv
[
i
]);
wcsncpy
(
ygo
::
mainGame
->
gameConf
.
lastdeck
,
wargv
[
i
],
sizeof
ygo
::
mainGame
->
gameConf
.
lastdeck
/
sizeof
ygo
::
mainGame
->
gameConf
.
lastdeck
[
0
]);
BufferIO
::
NullTerminate
(
ygo
::
mainGame
->
gameConf
.
lastdeck
);
continue
;
}
else
{
// open deck
exit_on_return
=
!
keep_on_return
;
...
...
@@ -135,7 +137,8 @@ int main(int argc, char* argv[]) {
myswprintf
(
open_file_name
,
L"%ls/%ls"
,
ygo
::
mainGame
->
gameConf
.
lastcategory
,
wargv
[
i
]);
#endif
}
else
{
wcscpy
(
open_file_name
,
wargv
[
i
]);
wcsncpy
(
open_file_name
,
wargv
[
i
],
sizeof
open_file_name
/
sizeof
open_file_name
[
0
]);
BufferIO
::
NullTerminate
(
open_file_name
);
}
}
ClickButton
(
ygo
::
mainGame
->
btnDeckEdit
);
...
...
@@ -156,7 +159,8 @@ int main(int argc, char* argv[]) {
++
i
;
if
(
i
<
wargc
)
{
open_file
=
true
;
wcscpy
(
open_file_name
,
wargv
[
i
]);
wcsncpy
(
open_file_name
,
wargv
[
i
],
sizeof
open_file_name
/
sizeof
open_file_name
[
0
]);
BufferIO
::
NullTerminate
(
open_file_name
);
}
ClickButton
(
ygo
::
mainGame
->
btnReplayMode
);
if
(
open_file
)
...
...
@@ -167,7 +171,8 @@ int main(int argc, char* argv[]) {
++
i
;
if
(
i
<
wargc
)
{
open_file
=
true
;
wcscpy
(
open_file_name
,
wargv
[
i
]);
wcsncpy
(
open_file_name
,
wargv
[
i
],
sizeof
open_file_name
/
sizeof
open_file_name
[
0
]);
BufferIO
::
NullTerminate
(
open_file_name
);
}
ClickButton
(
ygo
::
mainGame
->
btnSingleMode
);
if
(
open_file
)
...
...
@@ -177,14 +182,16 @@ int main(int argc, char* argv[]) {
wchar_t
*
pstrext
=
wargv
[
1
]
+
wcslen
(
wargv
[
1
])
-
4
;
if
(
!
mywcsncasecmp
(
pstrext
,
L".ydk"
,
4
))
{
open_file
=
true
;
wcscpy
(
open_file_name
,
wargv
[
i
]);
wcsncpy
(
open_file_name
,
wargv
[
i
],
sizeof
open_file_name
/
sizeof
open_file_name
[
0
]);
BufferIO
::
NullTerminate
(
open_file_name
);
exit_on_return
=
!
keep_on_return
;
ClickButton
(
ygo
::
mainGame
->
btnDeckEdit
);
break
;
}
if
(
!
mywcsncasecmp
(
pstrext
,
L".yrp"
,
4
))
{
open_file
=
true
;
wcscpy
(
open_file_name
,
wargv
[
i
]);
wcsncpy
(
open_file_name
,
wargv
[
i
],
sizeof
open_file_name
/
sizeof
open_file_name
[
0
]);
BufferIO
::
NullTerminate
(
open_file_name
);
exit_on_return
=
!
keep_on_return
;
ClickButton
(
ygo
::
mainGame
->
btnReplayMode
);
ClickButton
(
ygo
::
mainGame
->
btnLoadReplay
);
...
...
gframe/menu_handler.cpp
View file @
b05e0c96
...
...
@@ -448,7 +448,8 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
wcsncpy
(
deck_name
,
dash
+
1
,
256
);
for
(
size_t
i
=
0
;
i
<
mainGame
->
cbDBDecks
->
getItemCount
();
++
i
)
{
if
(
!
wcscmp
(
mainGame
->
cbDBDecks
->
getItem
(
i
),
deck_name
))
{
wcscpy
(
mainGame
->
gameConf
.
lastdeck
,
deck_name
);
wcsncpy
(
mainGame
->
gameConf
.
lastdeck
,
deck_name
,
sizeof
mainGame
->
gameConf
.
lastdeck
/
sizeof
mainGame
->
gameConf
.
lastdeck
[
0
]);
BufferIO
::
NullTerminate
(
mainGame
->
gameConf
.
lastdeck
);
mainGame
->
cbDBDecks
->
setSelected
(
i
);
break
;
}
...
...
@@ -456,7 +457,8 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
}
else
{
// only deck name
for
(
size_t
i
=
0
;
i
<
mainGame
->
cbDBDecks
->
getItemCount
();
++
i
)
{
if
(
!
wcscmp
(
mainGame
->
cbDBDecks
->
getItem
(
i
),
open_file_name
))
{
wcscpy
(
mainGame
->
gameConf
.
lastdeck
,
open_file_name
);
wcsncpy
(
mainGame
->
gameConf
.
lastdeck
,
open_file_name
,
sizeof
mainGame
->
gameConf
.
lastdeck
/
sizeof
mainGame
->
gameConf
.
lastdeck
[
0
]);
BufferIO
::
NullTerminate
(
mainGame
->
gameConf
.
lastdeck
);
mainGame
->
cbDBDecks
->
setSelected
(
i
);
break
;
}
...
...
Chen Bill
@salix5
mentioned in commit
48b01b83
·
Nov 06, 2024
mentioned in commit
48b01b83
mentioned in commit 48b01b838c40f614d73e8187fa3049e2a11f3268
Toggle commit list
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