From 3d9a7efb25592b403a29865eb32cdfa213ac9329 Mon Sep 17 00:00:00 2001 From: Dmytro Lysai Date: Tue, 7 Jul 2020 18:13:06 +0300 Subject: [PATCH] Remove World::make_object_standing() --- src/game/sequence/stand.rs | 2 +- src/game/state.rs | 2 +- src/game/world.rs | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/game/sequence/stand.rs b/src/game/sequence/stand.rs index aff128a..0136941 100644 --- a/src/game/sequence/stand.rs +++ b/src/game/sequence/stand.rs @@ -20,7 +20,7 @@ impl Sequence for Stand { if self.done { Result::Done } else { - ctx.world.make_object_standing(self.obj); + ctx.world.objects_mut().make_standing(self.obj); self.done = true; Result::Running(Running::NotLagging) } diff --git a/src/game/state.rs b/src/game/state.rs index da24b76..de81dd9 100644 --- a/src/game/state.rs +++ b/src/game/state.rs @@ -290,7 +290,7 @@ impl GameState { dude_obj.set_pos(Some(map.entrance)); let dude_obj = world.objects_mut().insert(dude_obj); - world.make_object_standing(dude_obj); + world.objects_mut().make_standing(dude_obj); { assert!(!map.savegame); diff --git a/src/game/world.rs b/src/game/world.rs index 0ea8966..b230afe 100644 --- a/src/game/world.rs +++ b/src/game/world.rs @@ -165,10 +165,6 @@ impl World { self.sqr_tiles[elevation as usize].is_some() } - pub fn make_object_standing(&mut self, h: object::Handle) { - self.objects.make_standing(h); - } - pub fn object_bounds(&self, obj: object::Handle, include_outline: bool) -> Rect { self.objects.bounds(obj, &self.camera.hex(), include_outline) }