X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAccount.cpp;h=354713570c9ea43522b8cca03ca3fa403302b6e0;hb=26debbd380c6922e5a0b60d99567c6374a4fef9a;hp=662c0d35ea2c48832d86945ef65e48c6e3ee0b3d;hpb=752c53b75078777dde112ebc552c860d8b7cfc28;p=lugaru.git

diff --git a/Source/Account.cpp b/Source/Account.cpp
index 662c0d3..3547135 100644
--- a/Source/Account.cpp
+++ b/Source/Account.cpp
@@ -46,12 +46,6 @@ Account::Account(string n) : campaignProgress() {
 
 void Account::setCurrentCampaign(string name) {
 	currentCampaign = name;
-	if(campaignProgress.find(name)==campaignProgress.end()) {
-		campaignProgress[name].highscore = 0;
-		campaignProgress[name].fasttime = 0;
-		campaignProgress[name].score = 0;
-		campaignProgress[name].time = 0;
-	}
 }
 
 Account* Account::add(string name) {
@@ -128,7 +122,7 @@ Account* Account::loadFile(string filename) {
 			funpackf(tfile, "Bi", &(acc->progress));
 			int nbCampaigns;
 			funpackf(tfile, "Bi", &nbCampaigns);
-			printf("loading %d campaign progress info\n",nbCampaigns);
+			//~ printf("loading %d campaign progress info\n",nbCampaigns);
 			
 			for(int k=0;k<nbCampaigns;++k) {
 				string campaignName = "";
@@ -140,7 +134,7 @@ Account* Account::loadFile(string filename) {
 					funpackf(tfile, "Bb",  &c);
 					campaignName.append(1,c);
 				}
-				printf("loading %s campaign progress info\n",campaignName.c_str());
+				//~ printf("loading %s campaign progress info\n",campaignName.c_str());
 				funpackf(tfile, "Bf", &(acc->campaignProgress[campaignName].time));
 				funpackf(tfile, "Bf", &(acc->campaignProgress[campaignName].score));
 				funpackf(tfile, "Bf", &(acc->campaignProgress[campaignName].fasttime));
@@ -218,7 +212,7 @@ void Account::saveFile(string filename, Account* accountactive) {
 			fpackf(tfile, "Bi", a->progress);
 			fpackf(tfile, "Bi", a->campaignProgress.size());
 			
-			map<string,campaign_progress_t>::const_iterator it;
+			map<string,CampaignProgress>::const_iterator it;
 			for( it=a->campaignProgress.begin(); it!= a->campaignProgress.end(); ++it) {
 				fpackf(tfile, "Bi",  it->first.size());
 				for(j=0;j<it->first.size();j++)