Skip to content
This repository was archived by the owner on Jan 2, 2025. It is now read-only.

Fixed uninitialized error in check_for_events #315

Merged
merged 1 commit into from
Jan 11, 2021
Merged

Fixed uninitialized error in check_for_events #315

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,17 @@ bitflags! {
}

pub fn check_for_event(event_mask: EventFlags) -> Option<(EventFlags, Event)> {
let mut c_key_state: ffi::TCOD_key_t = unsafe { mem::uninitialized() };
let mut c_mouse_state: ffi::TCOD_mouse_t = unsafe { mem::uninitialized() };
let mut c_key_state: mem::MaybeUninit<ffi::TCOD_key_t> = mem::MaybeUninit::uninit();
let mut c_mouse_state: mem::MaybeUninit<ffi::TCOD_mouse_t> = mem::MaybeUninit::uninit();

let event = unsafe {
ffi::TCOD_sys_check_for_event(event_mask.bits() as i32,
&mut c_key_state, &mut c_mouse_state)
c_key_state.as_mut_ptr(), c_mouse_state.as_mut_ptr())
};

let c_key_state = unsafe { c_key_state.assume_init() };
let c_mouse_state = unsafe { c_mouse_state.assume_init() };

let ret_flag = match event {
ffi::TCOD_event_t::TCOD_EVENT_KEY_PRESS => KEY_PRESS,
ffi::TCOD_event_t::TCOD_EVENT_KEY_RELEASE => KEY_RELEASE,
Expand Down