aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-11 17:59:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Use RYZOM_SHARE_PREFIX as prefix to look for leveldesign data

Browse source
This commit is contained in:
kervala 2012-09-26 12:53:03 +02:00
parent 7d0953d5a1
commit 6e0bc2baf9
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/nel/tools/3d/object_viewer_qt/src/plugins/core/general_settings_page.cpp
View file

@ -31,6 +31,10 @@
#include <QtGui/QStyleFactory> #include <QtGui/QStyleFactory>
#include <QtGui/QStyle> #include <QtGui/QStyle>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
namespace Core namespace Core
{ {
@ -83,11 +87,18 @@ void GeneralSettingsPage::applyGeneralSettings()
QApplication::setPalette(m_originalPalette); QApplication::setPalette(m_originalPalette);
settings->endGroup(); settings->endGroup();
QString levelDesignPrefix;
#if defined(_DEBUG) && defined(NL_OS_WINDOWS)
levelDesignPrefix = "l:";
#else
levelDesignPrefix = QString("%1/data_leveldesign").arg(RYZOM_SHARE_PREFIX);
#endif
// Add primitives path and ligo config file to CPath // Add primitives path and ligo config file to CPath
settings->beginGroup(Core::Constants::DATA_PATH_SECTION); settings->beginGroup(Core::Constants::DATA_PATH_SECTION);
QString primitivePath = settings->value(Core::Constants::PRIMITIVES_PATH, "l:/primitives").toString(); QString primitivePath = settings->value(Core::Constants::PRIMITIVES_PATH, QString("%1/primitives").arg(levelDesignPrefix)).toString();
QString ligoConfigFile = settings->value(Core::Constants::LIGOCONFIG_FILE, "l:/leveldesign/world_editor_files/world_editor_classes.xml").toString(); QString ligoConfigFile = settings->value(Core::Constants::LIGOCONFIG_FILE, QString("%1/leveldesign/world_editor_files/world_editor_classes.xml").arg(levelDesignPrefix)).toString();
QString leveldesignPath = settings->value(Core::Constants::LEVELDESIGN_PATH, "l:/leveldesign").toString(); QString leveldesignPath = settings->value(Core::Constants::LEVELDESIGN_PATH, QString("%1/leveldesign").arg(levelDesignPrefix)).toString();
NLMISC::CPath::addSearchPath(primitivePath.toStdString(), true, false); NLMISC::CPath::addSearchPath(primitivePath.toStdString(), true, false);
NLMISC::CPath::display(); NLMISC::CPath::display();
NLMISC::CPath::addSearchFile(ligoConfigFile.toStdString()); NLMISC::CPath::addSearchFile(ligoConfigFile.toStdString());