evan/ludum-dare-50
Archived
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correctly merge together object code

Browse Source
This commit is contained in:
Evan Pratten 2022-04-02 18:50:39 -04:00
parent 6bfeb8ea60
commit 93c869c53d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game/game_logic/src/scenes/player_interaction.rs
View File

@ -29,7 +29,7 @@ impl PlayableScene {
constants: &ProjectConstants, constants: &ProjectConstants,
) -> Self { ) -> 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 { Self {
has_updated_discord_rpc: false, has_updated_discord_rpc: false,
@ -96,7 +96,7 @@ impl PlayableScene {
let mut ctx2d = draw.begin_mode2D(self.camera); let mut ctx2d = draw.begin_mode2D(self.camera);
// Render the map // 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; let player_size = (constants.tile_size as f32 * constants.player.start_size * self.player.size) as i32;