Stowage/noita_entangled_worlds
2
0
Fork 0
mirror of https://github.com/IntQuant/noita_entangled_worlds.git synced 2025-10-19 07:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Maybe make FWS a bit safer.

Browse source
This commit is contained in:
IQuant 2024-09-28 23:14:05 +03:00
parent 5d7792a2e4
commit 279825fd7c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ewext/src/noita.rs
View file

@ -118,8 +118,8 @@ impl ParticleWorldState {
mat_id mat_id
} }
fn get_cell_type(&self, cell: &ntypes::Cell) -> ntypes::CellType { fn get_cell_type(&self, cell: &ntypes::Cell) -> Option<ntypes::CellType> {
unsafe { cell.material_ptr().as_ref().unwrap().cell_type } unsafe { Some(cell.material_ptr().as_ref()?.cell_type) }
} }
pub(crate) unsafe fn encode_area( pub(crate) unsafe fn encode_area(
@ -144,7 +144,7 @@ impl ParticleWorldState {
}; };
let cell = self.get_cell_raw(x, y); let cell = self.get_cell_raw(x, y);
if let Some(cell) = cell { if let Some(cell) = cell {
let cell_type = self.get_cell_type(cell); let cell_type = self.get_cell_type(cell).unwrap_or(ntypes::CellType::None);
match cell_type { match cell_type {
ntypes::CellType::None => {} ntypes::CellType::None => {}
// Nobody knows how box2d pixels work. // Nobody knows how box2d pixels work.
@ -158,7 +158,7 @@ impl ParticleWorldState {
raw_pixel.material = self.get_cell_material_id(cell); raw_pixel.material = self.get_cell_material_id(cell);
} }
// ??? // ???
ntypes::CellType::Invalid => {} _ => {}
} }
} }
self.runner.put_pixel(raw_pixel); self.runner.put_pixel(raw_pixel);