X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAccount.cpp;h=09bf0d1ef3ac4f285f5f4c5c2e5b831a6a1ea146;hb=24004d6ab1e68faaf85ece11b566449997da5013;hp=354713570c9ea43522b8cca03ca3fa403302b6e0;hpb=1eec4500c708d0619abf36759454f59fa175cacf;p=lugaru.git

diff --git a/Source/Account.cpp b/Source/Account.cpp
index 3547135..09bf0d1 100644
--- a/Source/Account.cpp
+++ b/Source/Account.cpp
@@ -11,7 +11,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -32,235 +32,231 @@ extern bool debugmode;
 
 vector<Account*> Account::accounts = vector<Account*>();
 
-Account::Account(string n) : campaignProgress() {
-	name = string(n);
-	difficulty = 0;
-	progress = 0;
-	points = 0;
-	memset(highscore, 0, sizeof(highscore));
-	memset(fasttime, 0, sizeof(fasttime));
-	memset(unlocked, 0, sizeof(unlocked));
-	
-	setCurrentCampaign("main");
+Account::Account(string n) : campaignProgress()
+{
+    name = string(n);
+    difficulty = 0;
+    progress = 0;
+    points = 0;
+    memset(highscore, 0, sizeof(highscore));
+    memset(fasttime, 0, sizeof(fasttime));
+    memset(unlocked, 0, sizeof(unlocked));
+
+    setCurrentCampaign("main");
 }
 
-void Account::setCurrentCampaign(string name) {
-	currentCampaign = name;
+void Account::setCurrentCampaign(string name)
+{
+    currentCampaign = name;
 }
 
-Account* Account::add(string name) {
-	accounts.push_back(new Account(name));
-	return accounts.back();
+Account* Account::add(string name)
+{
+    accounts.push_back(new Account(name));
+    return accounts.back();
 }
 
-Account* Account::get(int i) {
-	
-	if((i>=0)&&(i<accounts.size())) {
-		return accounts[i];
-	} else
-		return NULL;
+Account* Account::get(int i)
+{
+
+    if ((i >= 0) && (i < accounts.size())) {
+        return accounts[i];
+    } else
+        return NULL;
 }
 
-void Account::destroy(int i) {
-	accounts.erase(accounts.begin()+i);
+void Account::destroy(int i)
+{
+    accounts.erase(accounts.begin() + i);
 }
-Account* Account::destroy(Account* a) {
-	for(int i=0; i<accounts.size(); i++) {
-		if(accounts[i]==a) {
-			accounts.erase(accounts.begin()+i);
-			return NULL;
-		}
-	}
-	printf("Unexpected error : User %s not found\n",a->getName());
-	return accounts.front();
+Account* Account::destroy(Account* a)
+{
+    for (int i = 0; i < accounts.size(); i++) {
+        if (accounts[i] == a) {
+            accounts.erase(accounts.begin() + i);
+            return NULL;
+        }
+    }
+    printf("Unexpected error : User %s not found\n", a->getName());
+    return accounts.front();
 }
 
-int Account::getDifficulty() {
-	return difficulty;
+int Account::getDifficulty()
+{
+    return difficulty;
 }
 
-void Account::endGame() {
-	campaignProgress[currentCampaign].choices.clear();
-	campaignProgress[currentCampaign].score=0;
-	campaignProgress[currentCampaign].time=0;
+void Account::endGame()
+{
+    campaignProgress[currentCampaign].choices.clear();
+    campaignProgress[currentCampaign].score = 0;
+    campaignProgress[currentCampaign].time = 0;
 }
 
-void Account::winCampaignLevel(int choice, float score, float time) {
-	campaignProgress[currentCampaign].choices.push_back(choice);
-	setCampaignScore(campaignProgress[currentCampaign].score+score);
-	campaignProgress[currentCampaign].time = time;
+void Account::winCampaignLevel(int choice, float score, float time)
+{
+    campaignProgress[currentCampaign].choices.push_back(choice);
+    setCampaignScore(campaignProgress[currentCampaign].score + score);
+    campaignProgress[currentCampaign].time = time;
 }
 
-void Account::winLevel(int level, float score, float time) {
-	if(!debugmode) {
-		if(score>highscore[level])
-			highscore[level]=score;
-		if(time<fasttime[level]||fasttime[level]==0)
-			fasttime[level]=time;
-	}
-	if(progress<level+1)
-		progress=level+1;
+void Account::winLevel(int level, float score, float time)
+{
+    if (!debugmode) {
+        if (score > highscore[level])
+            highscore[level] = score;
+        if (time < fasttime[level] || fasttime[level] == 0)
+            fasttime[level] = time;
+    }
+    if (progress < level + 1)
+        progress = level + 1;
 }
 
-Account* Account::loadFile(string filename) {
-	FILE *tfile;
-	int numaccounts;
-	int accountactive;
-	
-	tfile=fopen(ConvertFileName(filename.c_str()), "rb" );
-	
-	if(tfile)
-	{
-		funpackf(tfile, "Bi", &numaccounts);
-		funpackf(tfile, "Bi", &accountactive);
-		printf("number of accounts %d\n",numaccounts);
-		for(int i=0;i<numaccounts;i++)
-		{
-			printf("loading account %d/%d\n",i,numaccounts);
-			Account* acc = new Account();
-			funpackf(tfile, "Bi", &(acc->difficulty));
-			funpackf(tfile, "Bi", &(acc->progress));
-			int nbCampaigns;
-			funpackf(tfile, "Bi", &nbCampaigns);
-			//~ printf("loading %d campaign progress info\n",nbCampaigns);
-			
-			for(int k=0;k<nbCampaigns;++k) {
-				string campaignName = "";
-				int t;
-				char c;
-				funpackf(tfile, "Bi",  &t);
-				for(int j=0;j<t;j++)
-				{
-					funpackf(tfile, "Bb",  &c);
-					campaignName.append(1,c);
-				}
-				//~ 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));
-				funpackf(tfile, "Bf", &(acc->campaignProgress[campaignName].highscore));
-				int campaignchoicesmade,campaignchoice;
-				funpackf(tfile, "Bi", &campaignchoicesmade);
-				for(int j=0;j<campaignchoicesmade;j++)
-				{
-					funpackf(tfile, "Bi", &campaignchoice);
-					if (campaignchoice >= 10) // what is that for?
-					{
-						campaignchoice = 0;
-					}
-					acc->campaignProgress[campaignName].choices.push_back(campaignchoice);
-				}
-			}
-			
-			acc->currentCampaign = "";
-			int t;
-			char c;
-			funpackf(tfile, "Bi",  &t);
-			for(int i=0;i<t;i++)
-			{
-				funpackf(tfile, "Bb",  &c);
-				acc->currentCampaign.append(1,c);
-			}
-			
-			funpackf(tfile, "Bf", &(acc->points));
-			for(int i=0;i<50;i++)
-			{
-				funpackf(tfile, "Bf", &(acc->highscore[i]));
-				funpackf(tfile, "Bf", &(acc->fasttime[i]));
-			}
-			for(int i=0;i<60;i++)
-			{
-				funpackf(tfile, "Bb",  &(acc->unlocked[i]));
-			}
-			int temp;
-			char ctemp;
-			funpackf(tfile, "Bi",  &temp);
-			for(int i=0;i<temp;i++)
-			{
-				funpackf(tfile, "Bb",  &ctemp);
-				acc->name.append(1,ctemp);
-			}
-			if(!strcmp(acc->name.c_str(),""))
-				acc->name="Lugaru Player"; // no empty player name security.
-			accounts.push_back(acc);
-		}
-
-		fclose(tfile);
-		return get(accountactive);
-	} else {
-		printf("filenotfound\n");
-		return NULL;
-	}
+Account* Account::loadFile(string filename)
+{
+    FILE *tfile;
+    int numaccounts;
+    int accountactive;
+
+    tfile = fopen(ConvertFileName(filename.c_str()), "rb" );
+
+    if (tfile) {
+        funpackf(tfile, "Bi", &numaccounts);
+        funpackf(tfile, "Bi", &accountactive);
+        printf("number of accounts %d\n", numaccounts);
+        for (int i = 0; i < numaccounts; i++) {
+            printf("loading account %d/%d\n", i, numaccounts);
+            Account* acc = new Account();
+            funpackf(tfile, "Bi", &(acc->difficulty));
+            funpackf(tfile, "Bi", &(acc->progress));
+            int nbCampaigns;
+            funpackf(tfile, "Bi", &nbCampaigns);
+            //~ printf("loading %d campaign progress info\n",nbCampaigns);
+
+            for (int k = 0; k < nbCampaigns; ++k) {
+                string campaignName = "";
+                int t;
+                char c;
+                funpackf(tfile, "Bi",  &t);
+                for (int j = 0; j < t; j++) {
+                    funpackf(tfile, "Bb",  &c);
+                    campaignName.append(1, c);
+                }
+                //~ 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));
+                funpackf(tfile, "Bf", &(acc->campaignProgress[campaignName].highscore));
+                int campaignchoicesmade, campaignchoice;
+                funpackf(tfile, "Bi", &campaignchoicesmade);
+                for (int j = 0; j < campaignchoicesmade; j++) {
+                    funpackf(tfile, "Bi", &campaignchoice);
+                    if (campaignchoice >= 10) { // what is that for?
+                        campaignchoice = 0;
+                    }
+                    acc->campaignProgress[campaignName].choices.push_back(campaignchoice);
+                }
+            }
+
+            acc->currentCampaign = "";
+            int t;
+            char c;
+            funpackf(tfile, "Bi",  &t);
+            for (int i = 0; i < t; i++) {
+                funpackf(tfile, "Bb",  &c);
+                acc->currentCampaign.append(1, c);
+            }
+
+            funpackf(tfile, "Bf", &(acc->points));
+            for (int i = 0; i < 50; i++) {
+                funpackf(tfile, "Bf", &(acc->highscore[i]));
+                funpackf(tfile, "Bf", &(acc->fasttime[i]));
+            }
+            for (int i = 0; i < 60; i++) {
+                funpackf(tfile, "Bb",  &(acc->unlocked[i]));
+            }
+            int temp;
+            char ctemp;
+            funpackf(tfile, "Bi",  &temp);
+            for (int i = 0; i < temp; i++) {
+                funpackf(tfile, "Bb",  &ctemp);
+                acc->name.append(1, ctemp);
+            }
+            if (!strcmp(acc->name.c_str(), ""))
+                acc->name = "Lugaru Player"; // no empty player name security.
+            accounts.push_back(acc);
+        }
+
+        fclose(tfile);
+        return get(accountactive);
+    } else {
+        printf("filenotfound\n");
+        return NULL;
+    }
 }
 
-void Account::saveFile(string filename, Account* accountactive) {
-	FILE *tfile;
-	int j;
-	
-	tfile=fopen(ConvertFileName(filename.c_str(), "wb"), "wb" );
-	if(tfile)
-	{
-		printf("writing %d accounts :\n",getNbAccounts());
-		fpackf(tfile, "Bi", getNbAccounts());
-		fpackf(tfile, "Bi", indice(accountactive));
-		
-		for(int i=0;i<getNbAccounts();i++)
-		{
-			Account* a = Account::get(i);
-			printf("writing account %d/%d (%s)\n",i+1,getNbAccounts(),a->getName());
-			fpackf(tfile, "Bi", a->difficulty);
-			fpackf(tfile, "Bi", a->progress);
-			fpackf(tfile, "Bi", a->campaignProgress.size());
-			
-			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++)
-				{
-					fpackf(tfile, "Bb",  it->first[j]);
-				}
-				fpackf(tfile, "Bf", it->second.time);
-				fpackf(tfile, "Bf", it->second.score);
-				fpackf(tfile, "Bf", it->second.fasttime);
-				fpackf(tfile, "Bf", it->second.highscore);
-				fpackf(tfile, "Bi", it->second.choices.size());
-				for(j=0;j<it->second.choices.size();j++)
-				{
-					fpackf(tfile, "Bi", it->second.choices[j]);
-				}
-			}
-			
-			fpackf(tfile, "Bi", a->getCurrentCampaign().size());
-			for(j=0;j<a->getCurrentCampaign().size();j++)
-			{
-				fpackf(tfile, "Bb", a->getCurrentCampaign()[j]);
-			}
-			
-			fpackf(tfile, "Bf", a->points);
-			for(j=0;j<50;j++)
-			{
-				fpackf(tfile, "Bf", a->highscore[j]);
-				fpackf(tfile, "Bf", a->fasttime[j]);
-			}
-			for(j=0;j<60;j++)
-			{
-				fpackf(tfile, "Bb",  a->unlocked[j]);
-			}
-			fpackf(tfile, "Bi",  a->name.size());
-			for(j=0;j<a->name.size();j++)
-			{
-				fpackf(tfile, "Bb",  a->name[j]);
-			}
-		}
-
-		fclose(tfile);
-	}
+void Account::saveFile(string filename, Account* accountactive)
+{
+    FILE *tfile;
+    int j;
+
+    tfile = fopen(ConvertFileName(filename.c_str(), "wb"), "wb" );
+    if (tfile) {
+        printf("writing %d accounts :\n", getNbAccounts());
+        fpackf(tfile, "Bi", getNbAccounts());
+        fpackf(tfile, "Bi", indice(accountactive));
+
+        for (int i = 0; i < getNbAccounts(); i++) {
+            Account* a = Account::get(i);
+            printf("writing account %d/%d (%s)\n", i + 1, getNbAccounts(), a->getName());
+            fpackf(tfile, "Bi", a->difficulty);
+            fpackf(tfile, "Bi", a->progress);
+            fpackf(tfile, "Bi", a->campaignProgress.size());
+
+            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++) {
+                    fpackf(tfile, "Bb",  it->first[j]);
+                }
+                fpackf(tfile, "Bf", it->second.time);
+                fpackf(tfile, "Bf", it->second.score);
+                fpackf(tfile, "Bf", it->second.fasttime);
+                fpackf(tfile, "Bf", it->second.highscore);
+                fpackf(tfile, "Bi", it->second.choices.size());
+                for (j = 0; j < it->second.choices.size(); j++) {
+                    fpackf(tfile, "Bi", it->second.choices[j]);
+                }
+            }
+
+            fpackf(tfile, "Bi", a->getCurrentCampaign().size());
+            for (j = 0; j < a->getCurrentCampaign().size(); j++) {
+                fpackf(tfile, "Bb", a->getCurrentCampaign()[j]);
+            }
+
+            fpackf(tfile, "Bf", a->points);
+            for (j = 0; j < 50; j++) {
+                fpackf(tfile, "Bf", a->highscore[j]);
+                fpackf(tfile, "Bf", a->fasttime[j]);
+            }
+            for (j = 0; j < 60; j++) {
+                fpackf(tfile, "Bb",  a->unlocked[j]);
+            }
+            fpackf(tfile, "Bi",  a->name.size());
+            for (j = 0; j < a->name.size(); j++) {
+                fpackf(tfile, "Bb",  a->name[j]);
+            }
+        }
+
+        fclose(tfile);
+    }
 }
 
-int Account::indice(Account* a) {
-	for(int i=0; i < accounts.size(); i++) {
-		if(accounts[i]==a)
-			return i;
-	}
-	return -1;
+int Account::indice(Account* a)
+{
+    for (int i = 0; i < accounts.size(); i++) {
+        if (accounts[i] == a)
+            return i;
+    }
+    return -1;
 }