Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
magicseteditor
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
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
MyCard
magicseteditor
Commits
d24b1bda
Commit
d24b1bda
authored
Aug 08, 2008
by
twanvl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ignore --color flags when creating installers and when exporting
parent
c5c89587
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
src/main.cpp
src/main.cpp
+8
-4
No files found.
src/main.cpp
View file @
d24b1bda
...
...
@@ -106,7 +106,7 @@ int MSE::OnRun() {
InstallType
type
=
settings
.
install_type
;
if
(
argc
>
2
)
{
String
arg
=
argv
[
2
];
if
(
starts_with
(
argv
[
2
],
_
(
"--"
)))
{
if
(
starts_with
(
argv
[
2
],
_
(
"--"
))
&&
arg
!=
_
(
"--color"
)
)
{
parse_enum
(
String
(
argv
[
2
]).
substr
(
2
),
type
);
}
}
...
...
@@ -122,7 +122,9 @@ int MSE::OnRun() {
// create an installer
Installer
inst
;
for
(
int
i
=
2
;
i
<
argc
;
++
i
)
{
inst
.
addPackage
(
argv
[
i
]);
if
(
!
starts_with
(
argv
[
i
],
_
(
"--"
)))
{
inst
.
addPackage
(
argv
[
i
]);
}
}
if
(
inst
.
prefered_filename
.
empty
())
{
throw
Error
(
_
(
"Specify packages to include in installer"
));
...
...
@@ -204,13 +206,15 @@ int MSE::OnRun() {
CLISetInterface
cli_interface
(
set
,
quiet
);
return
EXIT_SUCCESS
;
}
else
if
(
arg
==
_
(
"--export"
))
{
if
(
argc
<=
2
)
{
if
(
argc
<=
2
||
argc
<=
3
&&
starts_with
(
argv
[
2
],
_
(
"--"
))
)
{
handle_error
(
Error
(
_
(
"No input file specified for --export"
)));
return
EXIT_FAILURE
;
}
SetP
set
=
import_set
(
argv
[
2
]);
// path
String
out
=
argc
>=
3
?
argv
[
3
]
:
settings
.
gameSettingsFor
(
*
set
->
game
).
images_export_filename
;
String
out
=
argc
>=
3
&&
!
starts_with
(
argv
[
3
],
_
(
"--"
))
?
argv
[
3
]
:
settings
.
gameSettingsFor
(
*
set
->
game
).
images_export_filename
;
String
path
=
_
(
"."
);
size_t
pos
=
out
.
find_last_of
(
_
(
"/
\\
"
));
if
(
pos
!=
String
::
npos
)
{
...
...
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