Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-04-15 16:12:32 +02:00
commit 51e4d2a53c
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/nel/src/misc/cmd_args.cpp
View file

@ -220,6 +220,11 @@ bool CCmdArgs::parse(int argc, char **argv)
for(sint i = 0; i < argc; ++i) for(sint i = 0; i < argc; ++i)
{ {
#ifdef NL_OS_MAC
// get rid of -psn_* arguments under OS X
if (strncmp(argv[i], "-psn_", 5) == 0) continue;
#endif
args.push_back(argv[i]); args.push_back(argv[i]);
} }
@ -245,7 +250,7 @@ bool CCmdArgs::parse(const std::vector<std::string> &argv)
uint argc = argv.size(); uint argc = argv.size();
// process each argument // process each argument
for (sint i = 1; i < argc; i++) for (uint i = 1; i < argc; i++)
{ {
std::string name = argv[i]; std::string name = argv[i];