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
This commit is contained in:
kervala 2016-01-28 13:27:35 +01:00
parent 164eb4de7b
commit 9febb7374a
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -172,7 +172,7 @@ bool CCmdArgs::haveAdditionalArg(const std::string &name) const
// they don't have any short or long name, but need a name in help // they don't have any short or long name, but need a name in help
if (arg.shortName.empty() && arg.longName.empty() && !arg.helpName.empty() && arg.helpName == name && arg.found) if (arg.shortName.empty() && arg.longName.empty() && !arg.helpName.empty() && arg.helpName == name && arg.found)
return false; return true;
} }
return false; return false;

9
code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
View file

@ -75,6 +75,10 @@ CClientConfigDialog::CClientConfigDialog( QWidget *parent ) :
item = treeWidget->topLevelItem( 3 )->child( 1 ); item = treeWidget->topLevelItem( 3 )->child( 1 );
item->setData( 0, Qt::UserRole, 7 ); item->setData( 0, Qt::UserRole, 7 );
#ifndef Q_OS_WIN
// Hide Direct3D page under Linux and OS X
item->setHidden(true);
#endif
CategoryStackedWidget->addWidget( new CGeneralSettingsWidget( CategoryStackedWidget ) ); CategoryStackedWidget->addWidget( new CGeneralSettingsWidget( CategoryStackedWidget ) );
CategoryStackedWidget->addWidget( new CDisplaySettingsWidget( CategoryStackedWidget ) ); CategoryStackedWidget->addWidget( new CDisplaySettingsWidget( CategoryStackedWidget ) );
@ -85,6 +89,7 @@ CClientConfigDialog::CClientConfigDialog( QWidget *parent ) :
CategoryStackedWidget->addWidget( new CSysInfoOpenGLWidget( CategoryStackedWidget ) ); CategoryStackedWidget->addWidget( new CSysInfoOpenGLWidget( CategoryStackedWidget ) );
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
// Add Direct3D widget only under Windows
CategoryStackedWidget->addWidget( new CSysInfoD3DWidget( CategoryStackedWidget ) ); CategoryStackedWidget->addWidget( new CSysInfoD3DWidget( CategoryStackedWidget ) );
#endif #endif
@ -142,12 +147,10 @@ void CClientConfigDialog::onClickPlay()
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
started = QProcess::startDetached( "ryzom_client_r.exe" ); started = QProcess::startDetached( "ryzom_client_r.exe" );
if( !started )
QProcess::startDetached( "ryzom_client_rd.exe" );
if( !started ) if( !started )
QProcess::startDetached( "ryzom_client_d.exe" ); QProcess::startDetached( "ryzom_client_d.exe" );
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
started = QProcess::startDetached( "./Ryzom" ); started = QProcess::startDetached( "./Ryzom.app" );
#else #else
started = QProcess::startDetached( "./ryzom_client" ); started = QProcess::startDetached( "./ryzom_client" );
#endif #endif