From 9bfa6e26690e51497df87f4d90d5892dee342d00 Mon Sep 17 00:00:00 2001 From: luckyturtledev Date: Sun, 7 Jul 2024 14:38:34 +0200 Subject: [PATCH] fix house entering --- src/activities/overworld/mod.rs | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/activities/overworld/mod.rs b/src/activities/overworld/mod.rs index 90ea09f..d938547 100644 --- a/src/activities/overworld/mod.rs +++ b/src/activities/overworld/mod.rs @@ -146,9 +146,22 @@ fn update_move_player(state: &mut State, ctx: &mut EngineContext<'_>) { y: requested_pos_diff.y as _ }; state.ghost.overworld_pos_last_update = now; +} + +pub fn update(state: &mut State, ctx: &mut EngineContext<'_>) { + let mut camera = main_camera_mut(); + camera.center = state.ghost.overworld_pos; + camera.zoom = 30.0; + + // move player + update_move_player(state, ctx); //move into house if player stepp at door { + let tile_pos = IVec2 { + x: state.ghost.overworld_pos.x.round() as _, + y: state.ghost.overworld_pos.y.round() as _ + }; let current_tile = state.overworld.get_or_generate_tile(tile_pos); if current_tile.can_enter_house() { info!("enter house at {tile_pos}"); @@ -156,15 +169,6 @@ fn update_move_player(state: &mut State, ctx: &mut EngineContext<'_>) { state.house_mut(ctx); // gen new house } } -} - -pub fn update(state: &mut State, ctx: &mut EngineContext<'_>) { - let mut camera = main_camera_mut(); - camera.center = Vec2::ZERO; - camera.zoom = 30.0; - - // move player - update_move_player(state, ctx); // generate more chunks if needed {