lew/rust-rl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "cherry pick -> serde_json saves to bincode"

Browse source 
This reverts commit 180532ee3e.
This commit is contained in:
Llywelwyn 2024-06-15 16:42:59 +01:00
parent 9c8f301491
commit c73f9a5458
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -14,7 +14,6 @@ serde = { version = "1.0.93", features = ["derive"]}
serde_json = "1.0.39" serde_json = "1.0.39"
toml = "0.5" toml = "0.5"
lazy_static = "1.4.0" lazy_static = "1.4.0"
bincode = "1.3.3"
[dev-dependencies] [dev-dependencies]
criterion = { version = "^0.5" } criterion = { version = "^0.5" }

15
src/saveload_system.rs
View file

@ -1,5 +1,6 @@
use super::components::*; use super::components::*;
use bracket_lib::prelude::*; use bracket_lib::prelude::*;
use specs::error::NoError;
use specs::prelude::*; use specs::prelude::*;
use specs::saveload::{ use specs::saveload::{
DeserializeComponents, DeserializeComponents,
@ -55,8 +56,8 @@ pub fn save_game(ecs: &mut World) {
{ {
let data = (ecs.entities(), ecs.read_storage::<SimpleMarker<SerializeMe>>()); let data = (ecs.entities(), ecs.read_storage::<SimpleMarker<SerializeMe>>());
let writer = File::create("./savegame.bin").unwrap(); let writer = File::create("./savegame.json").unwrap();
let mut serializer = bincode::Serializer::new(writer, bincode::options()); let mut serializer = serde_json::Serializer::new(writer);
serialize_individually!( serialize_individually!(
ecs, ecs,
serializer, serializer,
@ -150,7 +151,7 @@ pub fn save_game(ecs: &mut World) {
} }
pub fn does_save_exist() -> bool { pub fn does_save_exist() -> bool {
Path::new("./savegame.bin").exists() Path::new("./savegame.json").exists()
} }
macro_rules! deserialize_individually { macro_rules! deserialize_individually {
@ -180,8 +181,8 @@ pub fn load_game(ecs: &mut World) {
} }
} }
let data = fs::read("./savegame.bin").unwrap(); let data = fs::read_to_string("./savegame.json").unwrap();
let mut de = bincode::Deserializer::with_reader(&*data, bincode::options()); let mut de = serde_json::Deserializer::from_str(&data);
{ {
let mut d = ( let mut d = (
@ -311,7 +312,7 @@ pub fn load_game(ecs: &mut World) {
} }
pub fn delete_save() { pub fn delete_save() {
if Path::new("./savegame.bin").exists() { if Path::new("./savegame.json").exists() {
std::fs::remove_file("./savegame.bin").expect("Unable to delete file"); std::fs::remove_file("./savegame.json").expect("Unable to delete file");
} }
} }