3 files changed, 22 insertions, 7 deletions
diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index b508d9f..2a091aa 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -1338,7 +1338,7 @@ LoginStatus Client::Login(std::string username, std::string password, User & use
 		}
 		catch (json::Exception &e)
 		{
-			lastError = "Server responded with crap";
+			lastError = "Could not read response";
 			return LoginError;
 		}
 	}
diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp
index 2a7c996..3d271a2 100644
--- a/src/client/GameSave.cpp
+++ b/src/client/GameSave.cpp
@@ -20,6 +20,7 @@ legacyEnable(save.legacyEnable),
 gravityEnable(save.gravityEnable),
 paused(save.paused),
 gravityMode(save.gravityMode),
+aheatEnable(save.aheatEnable),
 airMode(save.airMode),
 signs(save.signs),
 expanded(save.expanded),
@@ -171,10 +172,11 @@ void GameSave::Expand()
 {
 	if(hasOriginalData && !expanded)
 	{
-		waterEEnabled = 0;
-		legacyEnable = 0;
-		gravityEnable = 0;
-		paused = 0;
+		waterEEnabled = false;
+		legacyEnable = false;
+		gravityEnable = false;
+		aheatEnable = false;
+		paused = false;
 		gravityMode = 0;
 		airMode = 0;
 		expanded = true;
@@ -618,6 +620,17 @@ 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), "aheat_enable"))
+		{
+			if(bson_iterator_type(&iter)==BSON_BOOL)
+			{
+				aheatEnable = bson_iterator_bool(&iter);
+			}
+			else
+			{
+				fprintf(stderr, "Wrong type for %s\n", bson_iterator_key(&iter));
+			}
+		}
 		else if(strcmp(bson_iterator_key(&iter), "waterEEnabled")==0)
 		{
 			if(bson_iterator_type(&iter)==BSON_BOOL)
@@ -1962,8 +1975,8 @@ char * GameSave::serialiseOPS(int & dataLength)
 	bson_append_start_object(&b, "origin");
 	bson_append_int(&b, "majorVersion", SAVE_VERSION);
 	bson_append_int(&b, "minorVersion", MINOR_VERSION);
-	bson_append_int(&b, "buildNum", MINOR_VERSION);
-	bson_append_int(&b, "snapshotId", MINOR_VERSION);
+	bson_append_int(&b, "buildNum", BUILD_NUM);
+	bson_append_int(&b, "snapshotId", SNAPSHOT_ID);
 	bson_append_string(&b, "releaseType", IDENT_RELTYPE);
 	bson_append_string(&b, "platform", IDENT_PLATFORM);
 	bson_append_string(&b, "builtType", IDENT_BUILD);
@@ -1973,6 +1986,7 @@ char * GameSave::serialiseOPS(int & dataLength)
 	bson_append_bool(&b, "waterEEnabled", waterEEnabled);
 	bson_append_bool(&b, "legacyEnable", legacyEnable);
 	bson_append_bool(&b, "gravityEnable", gravityEnable);
+	bson_append_bool(&b, "aheat_enable", aheatEnable);
 	bson_append_bool(&b, "paused", paused);
 	bson_append_int(&b, "gravityMode", gravityMode);
 	bson_append_int(&b, "airMode", airMode);
diff --git a/src/client/GameSave.h b/src/client/GameSave.h
index cbabb3e..559b3a0 100644
--- a/src/client/GameSave.h
+++ b/src/client/GameSave.h
@@ -42,6 +42,7 @@ public:
 	bool waterEEnabled;
 	bool legacyEnable;
 	bool gravityEnable;
+	bool aheatEnable;
 	bool paused;
 	int gravityMode;
 	int airMode;