Update dependencies and rust version

This commit is contained in:
2025-03-04 20:46:16 -05:00
parent fddc7bdd0e
commit 9a34856c2b
25 changed files with 510 additions and 488 deletions
+4 -4
View File
@@ -6,8 +6,8 @@ use egui::{
};
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
use fixed::{
types::extra::{U3, U9},
FixedI32,
types::extra::{U3, U9},
};
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::{FromPrimitive, ToPrimitive};
@@ -17,12 +17,12 @@ use crate::{
images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
memory::{MemoryClient, MemoryRef, MemoryView},
window::{
utils::{NumberEdit, UiExt as _},
AppWindow,
utils::{NumberEdit, UiExt as _},
},
};
use super::utils::{self, shade, CellData, Object};
use super::utils::{self, CellData, Object, shade};
pub struct WorldWindow {
sim_id: SimId,
@@ -948,7 +948,7 @@ impl WorldHeader {
let new_value = (*source & 0x0030)
| if self.lon { 0x8000 } else { 0x0000 }
| if self.ron { 0x4000 } else { 0x0000 }
| self.mode.to_u16().unwrap() << 12
| (self.mode.to_u16().unwrap() << 12)
| ((self.scx as u16) << 10)
| ((self.scy as u16) << 8)
| if self.over { 0x0080 } else { 0x0000 }