diff options
Diffstat (limited to 'src/global_json.rs')
| -rw-r--r-- | src/global_json.rs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/global_json.rs b/src/global_json.rs index af69157..7ac109a 100644 --- a/src/global_json.rs +++ b/src/global_json.rs @@ -101,13 +101,17 @@ impl JsonState { Ok(GameState { status: GameStatus::Continue, players: [self.players[0].to_player()?, self.players[1].to_player()?], - obstacles: Rc::new( + muds: Rc::new( self.blocks .iter() - .filter(|cell| { - cell.surface_object == JsonSurfaceObject::Mud - || cell.surface_object == JsonSurfaceObject::OilSpill - }) + .filter(|cell| cell.surface_object == JsonSurfaceObject::Mud) + .map(|cell| cell.position.to_position()) + .collect(), + ), + oil_spills: Rc::new( + self.blocks + .iter() + .filter(|cell| cell.surface_object == JsonSurfaceObject::OilSpill) .map(|cell| cell.position.to_position()) .collect(), ), |