diff options
Diffstat (limited to 'src/client/GameSave.cpp')
| -rw-r--r-- | src/client/GameSave.cpp | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp index 9072921..1751c54 100644 --- a/src/client/GameSave.cpp +++ b/src/client/GameSave.cpp @@ -23,7 +23,8 @@ airMode(save.airMode), signs(save.signs), expanded(save.expanded), hasOriginalData(save.hasOriginalData), -originalData(save.originalData) +originalData(save.originalData), +palette(save.palette) { blockMap = NULL; blockMapPtr = NULL; @@ -659,6 +660,24 @@ void GameSave::readOPS(char * data, int dataLength) fprintf(stderr, "Wrong type for %s\n", bson_iterator_key(&iter)); } } + else if(strcmp(bson_iterator_key(&iter), "palette")==0) + { + palette.clear(); + if(bson_iterator_type(&iter)==BSON_ARRAY) + { + bson_iterator subiter; + bson_iterator_subiterator(&iter, &subiter); + while(bson_iterator_next(&subiter)) + { + if(bson_iterator_type(&subiter)==BSON_INT) + { + std::string id = std::string(bson_iterator_key(&subiter)); + int num = bson_iterator_int(&subiter); + palette.push_back(PaletteItem(id, num)); + } + } + } + } } //Read wall and fan data @@ -1622,7 +1641,7 @@ char * GameSave::serialiseOPS(int & dataLength) int x, y, i, wallDataFound = 0; int posCount, signsCount; bson b; - + std::fill(elementCount, elementCount+PT_NUM, 0); //Get coords in blocks @@ -1939,6 +1958,15 @@ char * GameSave::serialiseOPS(int & dataLength) bson_append_binary(&b, "fanMap", BSON_BIN_USER, (const char *)fanData, fanDataLen); if(soapLinkData) bson_append_binary(&b, "soapLinks", BSON_BIN_USER, (const char *)soapLinkData, soapLinkDataLen); + if(partsData && palette.size()) + { + bson_append_start_array(&b, "palette"); + for(std::vector<PaletteItem>::iterator iter = palette.begin(), end = palette.end(); iter != end; ++iter) + { + bson_append_int(&b, (*iter).first.c_str(), (*iter).second); + } + bson_append_finish_array(&b); + } signsCount = 0; for(i = 0; i < signs.size(); i++) { @@ -1965,7 +1993,9 @@ char * GameSave::serialiseOPS(int & dataLength) bson_append_finish_array(&b); } bson_finish(&b); +#ifdef DEBUG bson_print(&b); +#endif finalData = (unsigned char *)bson_data(&b); finalDataLen = bson_size(&b); @@ -1994,7 +2024,9 @@ char * GameSave::serialiseOPS(int & dataLength) goto fin; } +#ifdef DEBUG printf("compressed data: %d\n", outputDataLen); +#endif dataLength = outputDataLen + 12; fin: |