From 92bba055a46e28266c067d37f1a9274858f20704 Mon Sep 17 00:00:00 2001 From: LLLL Colonq Date: Sat, 6 Jun 2026 03:19:45 -0400 Subject: Update --- src/game.rs | 51 +++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) (limited to 'src/game.rs') diff --git a/src/game.rs b/src/game.rs index 0596a2b..29a7186 100644 --- a/src/game.rs +++ b/src/game.rs @@ -80,34 +80,29 @@ impl teleia::state::Game for Game { ("mrbeast".to_owned(), audio::Audio::new(&actx, include_bytes!("assets/audio/mrbeast.mp3"))), ]) } - fn finish_title(&mut self, ctx: &context::Context, st: &mut state::State) -> Erm<()> { - if self.mode == Mode::Titlescreen { - self.mode = Mode::Game; - ctx.lock_mouse(); - // TODO - if cfg!(target_arch = "wasm32") { - self.room.load_from_bytes(ctx, st, - Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/room.ini")), - include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/FLOOR.png"), - include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/WALL.png"), - include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/ROOF.png"), - include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/ART.png"), - include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/CREDIT.png"), - Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/MINI.png")), - Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/INTERACT.png")), - Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/LAYER.png")), - Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/MUSIC.mp3")), - Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/FOOT.wav")), - )?; - } else { - self.room.load(ctx, st, &self.room_path)?; - } - } - Ok(()) - } fn mouse_press(&mut self, ctx: &context::Context, st: &mut state::State) -> Erm<()> { match self.mode { Mode::Titlescreen => { + self.mode = Mode::Game; + ctx.lock_mouse(); + // TODO + // if cfg!(target_arch = "wasm32") { + // self.room.load_from_bytes(ctx, st, + // Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/room.ini")), + // include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/FLOOR.png"), + // include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/WALL.png"), + // include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/ROOF.png"), + // include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/ART.png"), + // include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/CREDIT.png"), + // Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/MINI.png")), + // Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/INTERACT.png")), + // Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/LAYER.png")), + // Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/MUSIC.mp3")), + // Some(include_bytes!("/home/llll/src/bapalon/DATA/NIGHT_1/ROOM_4/FOOT.wav")), + // )?; + // } else { + self.room.load(ctx, st, &self.room_path)?; + // } } Mode::Game => { self.room.credit_mode.toggle(st.tick); @@ -178,10 +173,10 @@ impl teleia::state::Game for Game { ctx.clear(); match self.mode { Mode::Titlescreen => { - self.assets.font.render_text( + self.assets.font.render_text_at( ctx, st, - &glam::Vec2::new(0.0, 0.0), - "click to continue", + glam::Vec2::new(0.0, 0.0), "click to continue", + font::BitmapParams::default(), ); } Mode::Game => { -- cgit v1.2.3