From 93c869c53da92ca50a9691b79223069e7d04ec05 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sat, 2 Apr 2022 18:50:39 -0400 Subject: [PATCH] Correctly merge together object code --- game/game_logic/src/scenes/player_interaction.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game/game_logic/src/scenes/player_interaction.rs b/game/game_logic/src/scenes/player_interaction.rs index 32aca9f3..638b08c3 100644 --- a/game/game_logic/src/scenes/player_interaction.rs +++ b/game/game_logic/src/scenes/player_interaction.rs @@ -29,7 +29,7 @@ impl PlayableScene { constants: &ProjectConstants, ) -> Self { - let map_renderer = MapRenderer::new("map_gameMap.tmx", raylib_handle, thread).unwrap(); + let map_renderer = MapRenderer::new("map_gameMap.tmx", "map_gameMap.objects.json", raylib_handle, thread).unwrap(); Self { has_updated_discord_rpc: false, @@ -96,7 +96,7 @@ impl PlayableScene { let mut ctx2d = draw.begin_mode2D(self.camera); // Render the map - self.world_map.render_map(&mut ctx2d, &self.camera, true); + self.world_map.render_map(&mut ctx2d, &self.camera, true, self.player.position); let player_size = (constants.tile_size as f32 * constants.player.start_size * self.player.size) as i32;