summaryrefslogtreecommitdiff
path: root/src/client/GameSave.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-07-28 17:38:34 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-07-28 17:38:34 (GMT)
commitc14a008d463dab4e6e2168fa28afb26384432b36 (patch)
treefece974b4df3a93b48393ceda3e6ec1d8e070164 /src/client/GameSave.cpp
parentca1f81a26423fd9c86bb76b20e9992db7204fa4f (diff)
downloadpowder-c14a008d463dab4e6e2168fa28afb26384432b36.zip
powder-c14a008d463dab4e6e2168fa28afb26384432b36.tar.gz
Corrections to GameSave to prevent conflicts in the Expanded state, improve Save preview comments display
Diffstat (limited to 'src/client/GameSave.cpp')
-rw-r--r--src/client/GameSave.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp
index c683119..96306ac 100644
--- a/src/client/GameSave.cpp
+++ b/src/client/GameSave.cpp
@@ -85,6 +85,9 @@ GameSave::GameSave(std::vector<char> data)
expanded = false;
hasOriginalData = true;
originalData = data;
+#ifdef DEBUG
+ std::cout << "Creating Collapsed save from data" << std::endl;
+#endif
try
{
Expand();
@@ -114,6 +117,9 @@ GameSave::GameSave(std::vector<unsigned char> data)
expanded = false;
hasOriginalData = true;
originalData = std::vector<char>(data.begin(), data.end());
+#ifdef DEBUG
+ std::cout << "Creating Collapsed save from data" << std::endl;
+#endif
try
{
Expand();
@@ -140,9 +146,12 @@ GameSave::GameSave(char * data, int dataSize)
fanVelYPtr = NULL;
particles = NULL;
- expanded = true;
+ expanded = false;
hasOriginalData = true;
originalData = std::vector<char>(data, data+dataSize);
+#ifdef DEBUG
+ std::cout << "Creating Expanded save from data" << std::endl;
+#endif
try
{
Expand();
@@ -219,10 +228,16 @@ void GameSave::read(char * data, int dataSize)
{
if(data[0] == 0x50 || data[0] == 0x66)
{
+#ifdef DEBUG
+ std::cout << "Reading PSv..." << std::endl;
+#endif
readPSv(data, dataSize);
}
else if(data[0] == 'O')
{
+#ifdef DEBUG
+ std::cout << "Reading OPS..." << std::endl;
+#endif
readOPS(data, dataSize);
}
else