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

authors clipboard fix

Browse Source 
MergeStampAuthorInfo prevents some duplication now, don't need this
This commit is contained in:
jacob1 2017-07-16 21:33:49 -04:00
parent 971e405462
commit ddce20da5b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/GameSave.cpp
View File

@ -637,6 +637,7 @@ void GameSave::readOPS(char * data, int dataLength)
fprintf(stderr, "Wrong type for %s\n", bson_iterator_key(&iter)); fprintf(stderr, "Wrong type for %s\n", bson_iterator_key(&iter));
} }
} }
#ifndef RENDERER
else if (!strcmp(bson_iterator_key(&iter), "authors")) else if (!strcmp(bson_iterator_key(&iter), "authors"))
{ {
if (bson_iterator_type(&iter) == BSON_OBJECT) if (bson_iterator_type(&iter) == BSON_OBJECT)
@ -651,6 +652,7 @@ void GameSave::readOPS(char * data, int dataLength)
fprintf(stderr, "Wrong type for %s\n", bson_iterator_key(&iter)); fprintf(stderr, "Wrong type for %s\n", bson_iterator_key(&iter));
} }
} }
#endif
} }
//Read wall and fan data //Read wall and fan data
@ -2389,7 +2391,7 @@ std::set<int> GetNestedSaveIDs(Json::Value j)
for (Json::Value::Members::iterator iter = members.begin(), end = members.end(); iter != end; ++iter) for (Json::Value::Members::iterator iter = members.begin(), end = members.end(); iter != end; ++iter)
{ {
std::string member = *iter; std::string member = *iter;
if (member == "id") if (member == "id" && j[member].isInt())
saveIDs.insert(j[member].asInt()); saveIDs.insert(j[member].asInt());
else if (j[member].isArray()) else if (j[member].isArray())
{ {

4
src/gui/game/GameController.cpp
View File

@ -330,9 +330,7 @@ void GameController::PlaceSave(ui::Point position)
if (!gameModel->GetSimulation()->Load(position.X, position.Y, placeSave)) if (!gameModel->GetSimulation()->Load(position.X, position.Y, placeSave))
{ {
gameModel->SetPaused(placeSave->paused | gameModel->GetPaused()); gameModel->SetPaused(placeSave->paused | gameModel->GetPaused());
// if this is a clipboard and there is no author info, don't do anything Client::Ref().MergeStampAuthorInfo(placeSave->authors);
if (placeSave->authors.size() && (Client::Ref().IsAuthorsEmpty() || placeSave->authors["type"] != "clipboard"))
Client::Ref().MergeStampAuthorInfo(placeSave->authors);
} }
} }
} }