From 8d492ef549dc3e2a8e22406fc099a56b7039beb5 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Tue, 25 Apr 2017 00:05:15 -0400
Subject: [PATCH] meant to move those functions into GameSave class

---
 src/client/GameSave.cpp | 41 ++++++++++++++++++++---------------------
 src/client/GameSave.h   |  4 ++++
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp
index d0a8bb4a4..c59d4d8bd 100644
--- a/src/client/GameSave.cpp
+++ b/src/client/GameSave.cpp
@@ -6,7 +6,6 @@
 #include <bzlib.h>
 #include "Config.h"
 #include "Format.h"
-#include "bson/BSON.h"
 #include "GameSave.h"
 #include "simulation/SimulationData.h"
 #include "ElementClasses.h"
@@ -406,7 +405,7 @@ void bson_error_handler(const char *err)
 	throw ParseException(ParseException::Corrupt, "BSON error when parsing save");
 }
 
-void checkBsonFieldUser(bson_iterator iter, const char *field, unsigned char **data, unsigned int *fieldLen)
+void GameSave::CheckBsonFieldUser(bson_iterator iter, const char *field, unsigned char **data, unsigned int *fieldLen)
 {
 	if (!strcmp(bson_iterator_key(&iter), field))
 	{
@@ -421,7 +420,7 @@ void checkBsonFieldUser(bson_iterator iter, const char *field, unsigned char **d
 	}
 }
 
-void checkBsonFieldBool(bson_iterator iter, const char *field, bool *flag)
+void GameSave::CheckBsonFieldBool(bson_iterator iter, const char *field, bool *flag)
 {
 	if (!strcmp(bson_iterator_key(&iter), field))
 	{
@@ -436,7 +435,7 @@ void checkBsonFieldBool(bson_iterator iter, const char *field, bool *flag)
 	}
 }
 
-void checkBsonFieldInt(bson_iterator iter, const char *field, int *setting)
+void GameSave::CheckBsonFieldInt(bson_iterator iter, const char *field, int *setting)
 {
 	if (!strcmp(bson_iterator_key(&iter), field))
 	{
@@ -522,23 +521,23 @@ void GameSave::readOPS(char * data, int dataLength)
 
 	while (bson_iterator_next(&iter))
 	{
-		checkBsonFieldUser(iter, "parts", &partsData, &partsDataLen);
-		checkBsonFieldUser(iter, "partsPos", &partsPosData, &partsPosDataLen);
-		checkBsonFieldUser(iter, "wallMap", &wallData, &wallDataLen);
-		checkBsonFieldUser(iter, "pressMap", &pressData, &pressDataLen);
-		checkBsonFieldUser(iter, "vxMap", &vxData, &vxDataLen);
-		checkBsonFieldUser(iter, "vyMap", &vyData, &vyDataLen);
-		checkBsonFieldUser(iter, "ambientMap", &ambientData, &ambientDataLen);
-		checkBsonFieldUser(iter, "fanMap", &fanData, &fanDataLen);
-		checkBsonFieldUser(iter, "soapLinks", &soapLinkData, &soapLinkDataLen);
-		checkBsonFieldBool(iter, "legacyEnable", &legacyEnable);
-		checkBsonFieldBool(iter, "gravityEnable", &gravityEnable);
-		checkBsonFieldBool(iter, "aheat_enable", &aheatEnable);
-		checkBsonFieldBool(iter, "waterEEnabled", &waterEEnabled);
-		checkBsonFieldBool(iter, "paused", &paused);
-		checkBsonFieldInt(iter, "gravityMode", &gravityMode);
-		checkBsonFieldInt(iter, "airMode", &airMode);
-		checkBsonFieldInt(iter, "edgeMode", &edgeMode);
+		CheckBsonFieldUser(iter, "parts", &partsData, &partsDataLen);
+		CheckBsonFieldUser(iter, "partsPos", &partsPosData, &partsPosDataLen);
+		CheckBsonFieldUser(iter, "wallMap", &wallData, &wallDataLen);
+		CheckBsonFieldUser(iter, "pressMap", &pressData, &pressDataLen);
+		CheckBsonFieldUser(iter, "vxMap", &vxData, &vxDataLen);
+		CheckBsonFieldUser(iter, "vyMap", &vyData, &vyDataLen);
+		CheckBsonFieldUser(iter, "ambientMap", &ambientData, &ambientDataLen);
+		CheckBsonFieldUser(iter, "fanMap", &fanData, &fanDataLen);
+		CheckBsonFieldUser(iter, "soapLinks", &soapLinkData, &soapLinkDataLen);
+		CheckBsonFieldBool(iter, "legacyEnable", &legacyEnable);
+		CheckBsonFieldBool(iter, "gravityEnable", &gravityEnable);
+		CheckBsonFieldBool(iter, "aheat_enable", &aheatEnable);
+		CheckBsonFieldBool(iter, "waterEEnabled", &waterEEnabled);
+		CheckBsonFieldBool(iter, "paused", &paused);
+		CheckBsonFieldInt(iter, "gravityMode", &gravityMode);
+		CheckBsonFieldInt(iter, "airMode", &airMode);
+		CheckBsonFieldInt(iter, "edgeMode", &edgeMode);
 		if (!strcmp(bson_iterator_key(&iter), "signs"))
 		{
 			if (bson_iterator_type(&iter)==BSON_ARRAY)
diff --git a/src/client/GameSave.h b/src/client/GameSave.h
index c76627df4..87eb8cafa 100644
--- a/src/client/GameSave.h
+++ b/src/client/GameSave.h
@@ -6,6 +6,7 @@
 #include "Config.h"
 #include "Misc.h"
 
+#include "bson/BSON.h"
 #include "simulation/Sign.h"
 #include "simulation/Particle.h"
 
@@ -101,6 +102,9 @@ private:
 
 	void InitData();
 	void InitVars();
+	void CheckBsonFieldUser(bson_iterator iter, const char *field, unsigned char **data, unsigned int *fieldLen);
+	void CheckBsonFieldBool(bson_iterator iter, const char *field, bool *flag);
+	void CheckBsonFieldInt(bson_iterator iter, const char *field, int *setting);
 	template <typename T> T ** Allocate2DArray(int blockWidth, int blockHeight, T defaultVal);
 	template <typename T> void Deallocate2DArray(T ***array, int blockHeight);
 	void dealloc();