X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FAccount.cpp;h=b93eff19ad5978f91628d4885a43c70a879c31be;hb=20e924d;hp=1d7bbd1d4951c94692b4e5fe7771aabf47ad955e;hpb=5509b55dbc13227bdc7b97f2934fa71dad02cc66;p=lugaru.git
diff --git a/Source/Account.cpp b/Source/Account.cpp
index 1d7bbd1..b93eff1 100644
--- a/Source/Account.cpp
+++ b/Source/Account.cpp
@@ -23,6 +23,7 @@ along with Lugaru. If not, see .
#include
#include "MacCompatibility.h"
#include "string.h"
+#include
using namespace std;
@@ -114,8 +115,9 @@ Account* Account::loadFile(string filename)
FILE *tfile;
int numaccounts;
int accountactive;
+ errno = 0;
- tfile = fopen(ConvertFileName(filename.c_str()), "rb" );
+ tfile = fopen(filename.c_str(), "rb" );
if (tfile) {
funpackf(tfile, "Bi", &numaccounts);
@@ -128,7 +130,6 @@ Account* Account::loadFile(string filename)
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 = "";
@@ -139,7 +140,6 @@ Account* Account::loadFile(string filename)
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));
@@ -187,7 +187,7 @@ Account* Account::loadFile(string filename)
fclose(tfile);
return get(accountactive);
} else {
- printf("filenotfound\n");
+ perror(("Couldn't load users from " + filename).c_str());
return NULL;
}
}
@@ -195,8 +195,9 @@ Account* Account::loadFile(string filename)
void Account::saveFile(string filename, Account* accountactive)
{
FILE *tfile;
+ errno = 0;
- tfile = fopen(ConvertFileName(filename.c_str(), "wb"), "wb" );
+ tfile = fopen(filename.c_str(), "wb" );
if (tfile) {
printf("writing %d accounts :\n", getNbAccounts());
fpackf(tfile, "Bi", getNbAccounts());
@@ -245,6 +246,8 @@ void Account::saveFile(string filename, Account* accountactive)
}
fclose(tfile);
+ } else {
+ perror(("Couldn't save users in " + filename).c_str());
}
}