equal
deleted
inserted
replaced
59 |
59 |
60 for (int i = 0; i < scriptList->size(); ++i) { |
60 for (int i = 0; i < scriptList->size(); ++i) { |
61 QString script = (*scriptList)[i].remove(".lua", Qt::CaseInsensitive); |
61 QString script = (*scriptList)[i].remove(".lua", Qt::CaseInsensitive); |
62 QList<QVariant> scriptInfo; |
62 QList<QVariant> scriptInfo; |
63 scriptInfo.push_back(script); |
63 scriptInfo.push_back(script); |
64 QFile scriptCfgFile(QString("%1/Scripts/Multiplayer/%2.cfg").arg(datadir->absolutePath()).arg(script)); |
64 QFile scriptCfgFile; |
|
65 scriptCfgFile.setFileName(QString("%1/Data/Scripts/Multiplayer/%2.cfg").arg(cfgdir->absolutePath()).arg(script)); |
|
66 if (!scriptCfgFile.exists()) scriptCfgFile.setFileName(QString("%1/Scripts/Multiplayer/%2.cfg").arg(datadir->absolutePath()).arg(script)); |
65 if (scriptCfgFile.exists() && scriptCfgFile.open(QFile::ReadOnly)) { |
67 if (scriptCfgFile.exists() && scriptCfgFile.open(QFile::ReadOnly)) { |
66 QString scheme; |
68 QString scheme; |
67 QString weapons; |
69 QString weapons; |
68 QTextStream input(&scriptCfgFile); |
70 QTextStream input(&scriptCfgFile); |
69 input >> scheme; |
71 input >> scheme; |