--- a/QTfrontend/campaign.cpp Wed Jun 26 22:44:33 2013 +0300
+++ b/QTfrontend/campaign.cpp Fri Jun 28 02:38:56 2013 +0300
@@ -17,11 +17,10 @@
*/
#include "campaign.h"
-
#include "hwconsts.h"
-
#include <QSettings>
-
+#include <QHash>
+#include <QDebug>
QStringList getCampMissionList(QString & campaign)
{
@@ -44,6 +43,53 @@
return teamfile.value("Campaign " + campName + "/Progress", 0).toInt();
}
+QHash<QString,QString> getUnlockedMissions2(QString & campaignName, QString & teamName)
+{
+ QHash<QString,QString> hash;
+ QSettings teamfile(cfgdir->absolutePath() + "/Teams/" + teamName + ".hwt", QSettings::IniFormat, 0);
+ teamfile.setIniCodec("UTF-8");
+ unsigned int progress = teamfile.value("Campaign " + campaignName + "/Progress", 0).toInt();
+ qDebug("HERE is progress : %d",progress);
+ unsigned int unlockedMissions = teamfile.value("Campaign " + campaignName + "/UnlockedMissions", 0).toInt();
+ qDebug("HERE is unlocked missions : %d",unlockedMissions);
+
+ QSettings campfile("physfs://Missions/Campaign/" + campaignName + "/campaign.ini", QSettings::IniFormat, 0);
+ campfile.setIniCodec("UTF-8");
+ unsigned int missionsNumber = campfile.value("MissionNum", 0).toInt();
+ qDebug("HERE is number of missions : %d",missionsNumber);
+
+ if(progress>0)
+ {
+ for(unsigned int i=1;i<=missionsNumber;i++)
+ {
+ hash[getCampaignScript(campaignName,i)] = campfile.value(QString("Mission %1/Name").arg(i)).toString();
+ }
+ }
+ else if(unlockedMissions>0)
+ {
+ for(unsigned int i=1;i<=unlockedMissions;i++)
+ {
+ int missionNumber = teamfile.value("Campaign " + campaignName + "/Mission"+i, -1).toInt();
+ hash[getCampaignScript(campaignName,missionNumber)] = campfile.value(QString("Mission %1/Name").arg(missionNumber)).toString();
+ }
+ }
+ return hash;
+}
+
+QStringList getUnlockedMissions(QString & teamName, QString & campName)
+{
+ QSettings teamfile(cfgdir->absolutePath() + "/Teams/" + teamName + ".hwt", QSettings::IniFormat, 0);
+ teamfile.setIniCodec("UTF-8");
+ unsigned int mNum = teamfile.value("UnlockedMissions", 0).toInt();
+
+ QStringList missionList;
+ for (unsigned int i = 0; i < mNum; i++)
+ {
+ missionList += teamfile.value(QString("Mission%1").arg(i + 1)).toString();
+ }
+ return missionList;
+}
+
QString getCampaignScript(QString campaign, unsigned int mNum)
{
QSettings campfile("physfs://Missions/Campaign/" + campaign + "/campaign.ini", QSettings::IniFormat, 0);
--- a/QTfrontend/campaign.h Wed Jun 26 22:44:33 2013 +0300
+++ b/QTfrontend/campaign.h Fri Jun 28 02:38:56 2013 +0300
@@ -27,5 +27,6 @@
QString getCampaignScript(QString campaign, unsigned int mNum);
QString getCampaignImage(QString campaign, unsigned int mNum);
QString getCampaignMissionName(QString campaign, unsigned int mNum);
+QHash<QString,QString> getUnlockedMissions2(QString & campaignName, QString & teamName);
#endif
--- a/QTfrontend/hwform.cpp Wed Jun 26 22:44:33 2013 +0300
+++ b/QTfrontend/hwform.cpp Fri Jun 28 02:38:56 2013 +0300
@@ -1896,7 +1896,6 @@
void HWForm::UpdateCampaignPage(int index)
{
Q_UNUSED(index);
-
HWTeam team(ui.pageCampaign->CBTeam->currentText());
ui.pageCampaign->CBMission->clear();
@@ -1906,6 +1905,7 @@
unsigned int n = missionEntries.count();
unsigned int m = getCampProgress(tName, campaignName);
+ getUnlockedMissions2(campaignName, tName);
// if the campaign name changes update the campaignMissionDescriptions list
// this will be used later in UpdateCampaignPageMission() to update
// the mission description in the campaign page