# HG changeset patch # User sheepluva # Date 1319223529 -7200 # Node ID 2d5717595471745a953a07f8ca659c91435582ed # Parent 6cb88fec7a79530e74135310abd83e99e798444d fix multiplayer script loading diff -r 6cb88fec7a79 -r 2d5717595471 QTfrontend/main.cpp --- a/QTfrontend/main.cpp Fri Oct 21 19:37:45 2011 +0200 +++ b/QTfrontend/main.cpp Fri Oct 21 20:58:49 2011 +0200 @@ -447,7 +447,7 @@ scriptList = new QStringList(HWDataManager::instance().entryList( QString("Scripts/Multiplayer"), - QDir::Dirs | QDir::NoDotAndDotDot, + QDir::Files, QStringList("*.lua") ) ); diff -r 6cb88fec7a79 -r 2d5717595471 QTfrontend/ui/widget/gamecfgwidget.cpp --- a/QTfrontend/ui/widget/gamecfgwidget.cpp Fri Oct 21 19:37:45 2011 +0200 +++ b/QTfrontend/ui/widget/gamecfgwidget.cpp Fri Oct 21 20:58:49 2011 +0200 @@ -28,6 +28,7 @@ #include "gamecfgwidget.h" #include "igbox.h" +#include "HWDataManager.h" #include "hwconsts.h" #include "ammoSchemeModel.h" #include "proto.h" @@ -62,9 +63,8 @@ QString script = (*scriptList)[i].remove(".lua", Qt::CaseInsensitive); QList scriptInfo; scriptInfo.push_back(script); - QFile scriptCfgFile; - scriptCfgFile.setFileName(QString("%1/Data/Scripts/Multiplayer/%2.cfg").arg(cfgdir->absolutePath()).arg(script)); - if (!scriptCfgFile.exists()) scriptCfgFile.setFileName(QString("%1/Scripts/Multiplayer/%2.cfg").arg(datadir->absolutePath()).arg(script)); + QFile scriptCfgFile(HWDataManager::instance().findFileForRead( + QString("Scripts/Multiplayer/%2.cfg").arg(script))); if (scriptCfgFile.exists() && scriptCfgFile.open(QFile::ReadOnly)) { QString scheme; QString weapons;