max
/
mixsy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

7.5 update

This commit is contained in:
Max Bradbury 2021-07-08 11:06:07 +01:00
parent cbe3a33311
commit ecd117afea
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "mixsy" name = "mixsy"
description = "combine Bitsy games" description = "combine Bitsy games"
version = "0.72.0" version = "0.75.0"
authors = ["Max Bradbury <max@tinybird.info>"] authors = ["Max Bradbury <max@tinybird.info>"]
edition = "2018" edition = "2018"
license = "MIT" license = "MIT"
@ -13,6 +13,6 @@ repository = "https://tinybird.dev/max/mixsy"
crate-type = ["cdylib"] crate-type = ["cdylib"]
[dependencies] [dependencies]
"bitsy-parser" = "^0.72.0" "bitsy-parser" = "^0.75.0"
"lazy_static" = "^1.4.0" "lazy_static" = "^1.4.0"
"wasm-bindgen" = "^0.2.64" "wasm-bindgen" = "^0.2.64"

17
src/lib.rs
View File

@ -16,10 +16,11 @@ lazy_static! {
#[wasm_bindgen] #[wasm_bindgen]
pub fn load_main(game_data: String) -> String { pub fn load_main(game_data: String) -> String {
let game = Game::from(game_data); let result = Game::from(game_data);
if game.is_ok() { if result.is_ok() {
STATE.lock().unwrap().main = Some(game.unwrap()); let (game, _errors) = result.unwrap();
STATE.lock().unwrap().main = Some(game);
"OK!" "OK!"
} else { } else {
"Could not parse game data" "Could not parse game data"
@ -28,10 +29,11 @@ pub fn load_main(game_data: String) -> String {
#[wasm_bindgen] #[wasm_bindgen]
pub fn load_additional(game_data: String) -> String { pub fn load_additional(game_data: String) -> String {
let game = Game::from(game_data); let result = Game::from(game_data);
if game.is_ok() { if result.is_ok() {
STATE.lock().unwrap().additional = Some(game.unwrap()); let (game, _errors) = result.unwrap();
STATE.lock().unwrap().additional = Some(game);
"OK!" "OK!"
} else { } else {
"Could not parse game data" "Could not parse game data"
@ -47,7 +49,8 @@ pub fn merge() -> String {
} }
let mut main = state.main.clone().unwrap(); let mut main = state.main.clone().unwrap();
let additional = state.additional.clone().unwrap(); let additional = state.additional.as_ref().unwrap();
main.merge(additional); main.merge(additional);
main.dedupe_tiles(); main.dedupe_tiles();
main.to_string() main.to_string()