From 05f8c90ec01d659d7f0bcbe7f0f55941566fe601 Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Fri, 4 Aug 2023 05:45:15 -0500
Subject: [PATCH] Standardize data types using a data type enum. Get function
 implemented.

---
 SHNFileDecryptor/AbState.shn.bak     | Bin 227224 -> 227224 bytes
 SHNFileDecryptor/SHNFileDecryptor.h  |  50 +++++++++++++++++----------
 SHNFileDecryptor/SHNFile_example.cpp |   2 ++
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/SHNFileDecryptor/AbState.shn.bak b/SHNFileDecryptor/AbState.shn.bak
index 49c9c463c26aac034c18ce1c04459e08a8512cf1..2fd7fc33ac85a07fe0146ef2f278e80fce384ab7 100644
GIT binary patch
delta 38
tcmbR7o_EH3-VM#H+^<9qGw<NrAAiK#rn!%`y^oa<h?%zcu`+WN0RTUc4s`$k

delta 38
tcmbR7o_EH3-VM#H+~4`nnr`HuZ@knZq`8l^y^oa<h?%zcu`+WN0RTNo4ov_6

diff --git a/SHNFileDecryptor/SHNFileDecryptor.h b/SHNFileDecryptor/SHNFileDecryptor.h
index d1a6d1f..2daf97f 100644
--- a/SHNFileDecryptor/SHNFileDecryptor.h
+++ b/SHNFileDecryptor/SHNFileDecryptor.h
@@ -37,9 +37,19 @@ class SHNFile{
 	std::string ReadString();
 	uint32_t GetRecordLength();
 public:
+	enum class DataType:int{
+		BYTE=1,
+		SBYTE=7,
+		UINT16=2,
+		INT16=6,
+		UINT32=3,
+		INT32=8,
+		FLOAT=4,
+		STRING=5
+	};
 	struct Data{
 		std::shared_ptr<void>data;
-		int type=0;
+		DataType type=DataType::BYTE;
 		Data(byte b);
 		Data(sbyte b);
 		Data(uint16_t n);
@@ -82,6 +92,7 @@ public:
 	void Write(int row,int col,uint32_t val);
 	void Write(int row,int col,float val);
 	void Write(int row,int col,std::string val);
+	const SHNFile::Data Get(int row,int col)const;
 	SHNFile();
 };
 #ifdef OLC_PGEX_SHNFile
@@ -223,7 +234,7 @@ float SHNFile::ReadSingle(){
 	return f;
 }
 void SHNFile::WriteSingle(std::ofstream&f,float n){
-	byte bytes[4];
+	byte bytes[4]={};
 	memcpy(&n,&bytes,4);
 	for(int i=0;i<4;i++){
 		f<<unsigned char(bytes[i]);
@@ -254,42 +265,42 @@ uint32_t SHNFile::GetRecordLength(){
 SHNFile::Data::Data(byte b){
 	std::shared_ptr<byte>ptr=std::make_shared<byte>(byte(b));
 	data=ptr;
-	type=1;
+	type=DataType::BYTE;
 }
 SHNFile::Data::Data(sbyte b){
 	std::shared_ptr<sbyte>ptr=std::make_shared<sbyte>(sbyte(b));
 	data=ptr;
-	type=7;
+	type=DataType::SBYTE;
 }
 SHNFile::Data::Data(uint16_t n){
 	std::shared_ptr<uint16_t>ptr=std::make_shared<uint16_t>(uint16_t(n));
 	data=ptr;
-	type=2;
+	type=DataType::UINT16;
 }
 SHNFile::Data::Data(int16_t n){
 	std::shared_ptr<int16_t>ptr=std::make_shared<int16_t>(int16_t(n));
 	data=ptr;
-	type=6;
+	type=DataType::INT16;
 }
 SHNFile::Data::Data(uint32_t n){
 	std::shared_ptr<uint32_t>ptr=std::make_shared<uint32_t>(uint32_t(n));
 	data=ptr;
-	type=3;
+	type=DataType::UINT32;
 }
 SHNFile::Data::Data(int32_t n){
 	std::shared_ptr<int32_t>ptr=std::make_shared<int32_t>(int32_t(n));
 	data=ptr;
-	type=8;
+	type=DataType::INT32;
 }
 SHNFile::Data::Data(float n){
 	std::shared_ptr<float>ptr=std::make_shared<float>(float(n));
 	data=ptr;
-	type=4;
+	type=DataType::FLOAT;
 }
 SHNFile::Data::Data(std::string str){
 	std::shared_ptr<std::string>ptr=std::make_shared<std::string>(str);
 	data=ptr;
-	type=5;
+	type=DataType::STRING;
 }
 template <typename T>
 T SHNFile::Data::Get(){
@@ -301,28 +312,28 @@ void SHNFile::Data::Set(T b){
 }
 std::string SHNFile::Data::GetDisplayText(){
 	switch(type){
-		case 1:{
+		case DataType::BYTE:{
 			return std::to_string(int(Get<byte>()));
 		}break;
-		case 7:{
+		case DataType::SBYTE:{
 			return std::to_string(int(Get<sbyte>()));
 		}break;
-		case 2:{
+		case DataType::UINT16:{
 			return std::to_string(Get<uint16_t>());
 		}break;
-		case 6:{
+		case DataType::INT16:{
 			return std::to_string(Get<int16_t>());
 		}break;
-		case 3:{
+		case DataType::UINT32:{
 			return std::to_string(Get<uint32_t>());
 		}break;
-		case 8:{
+		case DataType::INT32:{
 			return std::to_string(Get<int32_t>());
 		}break;
-		case 4:{
+		case DataType::FLOAT:{
 			return std::to_string(Get<float>());
 		}break;
-		case 5:{
+		case DataType::STRING:{
 			return Get<std::string>();
 		}break;
 	}
@@ -497,6 +508,9 @@ void SHNFile::Save(){
 	WriteBytes(encryptedFile,data);
 	std::cout<<"File "<<filename<<" Saved!"<<std::endl;
 }
+const SHNFile::Data SHNFile::Get(int row,int col)const{
+	return contents[row][col];	
+};
 void SHNFile::Write(int row,int col,byte val){
 	contents[row][col].Set<byte>(val);
 }
diff --git a/SHNFileDecryptor/SHNFile_example.cpp b/SHNFileDecryptor/SHNFile_example.cpp
index 3fec96d..d6cfc23 100644
--- a/SHNFileDecryptor/SHNFile_example.cpp
+++ b/SHNFileDecryptor/SHNFile_example.cpp
@@ -4,6 +4,8 @@
 int main(){
 	SHNFile shn;
 	shn.Load("AbState.shn");
+	SHNFile::Data dat=shn.Get(3,6);
+	std::cout<<dat<<std::endl;
 	shn.Write(1,1,"Noodles");
 	shn.Save();
 }
\ No newline at end of file