QTfrontend/hwform.cpp
branchspacecampaign
changeset 9275 3df990e2ee0e
parent 9272 6fa30e491b37
child 9278 33a30ce9782f
--- a/QTfrontend/hwform.cpp	Fri Jun 28 02:38:56 2013 +0300
+++ b/QTfrontend/hwform.cpp	Fri Jun 28 15:45:11 2013 +0300
@@ -1900,12 +1900,12 @@
     ui.pageCampaign->CBMission->clear();
 
     QString campaignName = ui.pageCampaign->CBCampaign->currentText();
-    QStringList missionEntries = getCampMissionList(campaignName);
     QString tName = team.name();
+    QStringList missionEntries = getCampMissionList2(campaignName,tName);
     unsigned int n = missionEntries.count();
     unsigned int m = getCampProgress(tName, campaignName);
 
-	getUnlockedMissions2(campaignName, tName);
+	//unlockedMissionsHash = 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
@@ -1942,7 +1942,7 @@
         campaignMissionDescriptions.clear();
         ui.pageCampaign->CBMission->clear();
     }
-
+/*
     for (unsigned int i = qMin(m + 1, n); i > 0; i--)
     {
         if(updateMissionList)
@@ -1951,7 +1951,16 @@
                                             tr("No description available")).toString();
         }
         ui.pageCampaign->CBMission->addItem(QString("Mission %1: ").arg(i) + QString(missionEntries[i-1]), QString(missionEntries[i-1]));
-    }
+    }*/
+    for(int i=0;i<missionEntries.size();i++)
+    {
+		/*if(updateMissionList)
+        {
+            campaignMissionDescriptions += m_info->value(campaignName+"-"+ getCampaignMissionName(campaignName,i) + ".desc",
+                                            tr("No description available")).toString();
+        }*/
+        ui.pageCampaign->CBMission->addItem(QString("Mission %1: ").arg(missionEntries.size()-i) + QString(missionEntries[i]), QString(missionEntries[i]));
+	}
     if(updateMissionList)
         delete m_info;