From c73f9a545863de84297faf4fe932314724125a2b Mon Sep 17 00:00:00 2001
From: Llywelwyn <lewiiswynne@gmail.com>
Date: Sat, 15 Jun 2024 16:42:59 +0100
Subject: [PATCH] Revert "cherry pick -> serde_json saves to bincode"

This reverts commit 180532ee3e3bb53565ba8801515e5af8beb9994a.
---
 Cargo.toml             |  1 -
 src/saveload_system.rs | 15 ++++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e764a60..24b6918 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,6 @@ serde = { version = "1.0.93", features = ["derive"]}
 serde_json = "1.0.39"
 toml = "0.5"
 lazy_static = "1.4.0"
-bincode = "1.3.3"
 
 [dev-dependencies]
 criterion = { version = "^0.5" }
diff --git a/src/saveload_system.rs b/src/saveload_system.rs
index 5260b82..ccdc1ee 100644
--- a/src/saveload_system.rs
+++ b/src/saveload_system.rs
@@ -1,5 +1,6 @@
 use super::components::*;
 use bracket_lib::prelude::*;
+use specs::error::NoError;
 use specs::prelude::*;
 use specs::saveload::{
     DeserializeComponents,
@@ -55,8 +56,8 @@ pub fn save_game(ecs: &mut World) {
     {
         let data = (ecs.entities(), ecs.read_storage::<SimpleMarker<SerializeMe>>());
 
-        let writer = File::create("./savegame.bin").unwrap();
-        let mut serializer = bincode::Serializer::new(writer, bincode::options());
+        let writer = File::create("./savegame.json").unwrap();
+        let mut serializer = serde_json::Serializer::new(writer);
         serialize_individually!(
             ecs,
             serializer,
@@ -150,7 +151,7 @@ pub fn save_game(ecs: &mut World) {
 }
 
 pub fn does_save_exist() -> bool {
-    Path::new("./savegame.bin").exists()
+    Path::new("./savegame.json").exists()
 }
 
 macro_rules! deserialize_individually {
@@ -180,8 +181,8 @@ pub fn load_game(ecs: &mut World) {
         }
     }
 
-    let data = fs::read("./savegame.bin").unwrap();
-    let mut de = bincode::Deserializer::with_reader(&*data, bincode::options());
+    let data = fs::read_to_string("./savegame.json").unwrap();
+    let mut de = serde_json::Deserializer::from_str(&data);
 
     {
         let mut d = (
@@ -311,7 +312,7 @@ pub fn load_game(ecs: &mut World) {
 }
 
 pub fn delete_save() {
-    if Path::new("./savegame.bin").exists() {
-        std::fs::remove_file("./savegame.bin").expect("Unable to delete file");
+    if Path::new("./savegame.json").exists() {
+        std::fs::remove_file("./savegame.json").expect("Unable to delete file");
     }
 }