phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2025-03-22 01:49:33 +00:00
Code Issues Releases Wiki Activity

fix few warnings

Browse source
This commit is contained in:
Alula 2022-01-08 06:15:30 +01:00
parent b80f57ae49
commit 4d6768c015
No known key found for this signature in database
GPG key ID: 3E00485503A1D8BA
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/framework/backend_sdl2.rs
View file

@ -1,6 +1,5 @@
use core::mem;
use std::any::Any;
use std::borrow::Borrow;
use std::cell::{RefCell, UnsafeCell};
use std::ffi::c_void;
use std::ops::Deref;
@ -223,10 +222,8 @@ impl BackendEventLoop for SDL2EventLoop {
game.update(ctx).unwrap();
if state.next_scene.is_some() {
mem::swap(&mut game.scene, &mut state.next_scene);
state.next_scene = None;
if let Some(_) = &state.next_scene {
game.scene = mem::take(&mut state.next_scene);
game.scene.as_mut().unwrap().init(state, ctx).unwrap();
game.loops = 0;
state.frame_time = 0.0;
@ -237,6 +234,7 @@ impl BackendEventLoop for SDL2EventLoop {
self.refs.deref().borrow().canvas.window(),
&self.event_pump.mouse_state(),
);
game.draw(ctx).unwrap();
}
}
@ -304,6 +302,7 @@ struct SDL2Renderer {
refs: Rc<RefCell<SDL2Context>>,
imgui: Rc<RefCell<imgui::Context>>,
imgui_event: Rc<RefCell<ImguiSdl2>>,
#[allow(unused)] // the rendering pipeline uses pointers to SDL_Texture, and we manually manage the lifetimes
imgui_font_tex: SDL2Texture,
}

1
src/sound/ogg_playback.rs
View file

@ -4,7 +4,6 @@ use lewton::inside_ogg::OggStreamReader;
use num_traits::clamp;
use crate::framework::filesystem::File;
use crate::sound::stuff::cubic_interp;
use crate::sound::wav::WavFormat;
pub(crate) struct OggPlaybackEngine {