pr9.4
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
#![allow(clippy::collapsible_if)]
|
||||
use crate::memory_banks::{SoundBankPoolInstaller, TileBankPoolInstaller};
|
||||
use prometeu_hal::AssetBridge;
|
||||
use prometeu_hal::asset::{
|
||||
@@ -486,12 +487,12 @@ impl AssetManager {
|
||||
let palette_data = &buffer[pixel_data_size..pixel_data_size + 2048];
|
||||
|
||||
let mut palettes = [[Color::BLACK; 16]; 64];
|
||||
for p in 0..64 {
|
||||
for c in 0..16 {
|
||||
for (p, pal) in palettes.iter_mut().enumerate() {
|
||||
for (c, slot) in pal.iter_mut().enumerate() {
|
||||
let offset = (p * 16 + c) * 2;
|
||||
let color_raw =
|
||||
u16::from_le_bytes([palette_data[offset], palette_data[offset + 1]]);
|
||||
palettes[p][c] = Color(color_raw);
|
||||
*slot = Color(color_raw);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -687,7 +688,7 @@ impl AssetManager {
|
||||
match slot.asset_type {
|
||||
BankType::TILES => {
|
||||
let slots = self.gfx_slots.read().unwrap();
|
||||
let asset_id = slots.get(slot.index).and_then(|s| s.clone());
|
||||
let asset_id = slots.get(slot.index).and_then(|s| *s);
|
||||
|
||||
let (bytes, asset_name) = if let Some(id) = &asset_id {
|
||||
let bytes = self
|
||||
@@ -708,7 +709,7 @@ impl AssetManager {
|
||||
}
|
||||
BankType::SOUNDS => {
|
||||
let slots = self.sound_slots.read().unwrap();
|
||||
let asset_id = slots.get(slot.index).and_then(|s| s.clone());
|
||||
let asset_id = slots.get(slot.index).and_then(|s| *s);
|
||||
|
||||
let (bytes, asset_name) = if let Some(id) = &asset_id {
|
||||
let bytes = self
|
||||
|
||||
Reference in New Issue
Block a user