matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix saves getting corrupted when saving, fix error messages not showing (correctly)

Browse Source
This commit is contained in:
jacob1 2012-09-30 15:10:11 -04:00 committed by Simon Robertshaw
parent be1b9112e8
commit f652786557
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/client/Client.cpp
View File

@ -756,11 +756,19 @@ RequestStatus Client::UploadSave(SaveInfo & save)
return RequestFailure;
}
char *saveName = new char[save.GetName().length() + 1];
std::strcpy ( saveName, save.GetName().c_str() );
char *saveDescription = new char[save.GetDescription().length() + 1];
std::strcpy ( saveDescription, save.GetDescription().c_str() );
char * postNames[] = { "Name", "Description", "Data:save.bin", "Publish", NULL };
char * postDatas[] = { (char *)(save.GetName().c_str()), (char *)(save.GetDescription().c_str()), gameData, (char *)(save.GetPublished()?"Public":"Private") };
char * postDatas[] = { saveName, saveDescription, gameData, (char *)(save.GetPublished()?"Public":"Private") };
int postLengths[] = { save.GetName().length(), save.GetDescription().length(), gameDataLength, save.GetPublished()?6:7 };
//std::cout << postNames[0] << " " << postDatas[0] << " " << postLengths[0] << std::endl;
data = http_multipart_post("http://" SERVER "/Save.api", postNames, postDatas, postLengths, (char *)(userIDStream.str().c_str()), NULL, (char *)(authUser.SessionID.c_str()), &dataStatus, &dataLength);
delete[] saveDescription;
delete[] saveName;
}
else
{
@ -772,8 +780,8 @@ RequestStatus Client::UploadSave(SaveInfo & save)
if(strncmp((const char *)data, "OK", 2)!=0)
{
if(gameData) free(gameData);
free(data);
lastError = std::string((const char *)data);
free(data);
return RequestFailure;
}
else
@ -955,8 +963,8 @@ RequestStatus Client::ExecVote(int saveID, int direction)
{
if(strncmp((const char *)data, "OK", 2)!=0)
{
free(data);
lastError = std::string((const char *)data);
free(data);
return RequestFailure;
}
free(data);

2
src/save/ServerSaveActivity.cpp
View File

@ -153,7 +153,7 @@ void ServerSaveActivity::NotifyDone(Task * task)
Exit();
if(!task->GetSuccess())
{
new ErrorMessage("Error", "Error while saving");
new ErrorMessage("Error", Client::Ref().GetLastError());
}
}