summaryrefslogtreecommitdiff
path: root/shared
diff options
context:
space:
mode:
Diffstat (limited to 'shared')
-rw-r--r--shared/src/packets.rs4
-rw-r--r--shared/src/resources.rs4
2 files changed, 5 insertions, 3 deletions
diff --git a/shared/src/packets.rs b/shared/src/packets.rs
index 1d3155f..66b0b55 100644
--- a/shared/src/packets.rs
+++ b/shared/src/packets.rs
@@ -58,7 +58,7 @@ pub enum Packet {
Parent(Object, Object),
Sound(Object, Data),
PrefabIndex(Resource<PrefabIndex>),
- PrefabName(Resource, String),
+ PrefabName(Resource<Prefab>, String),
}
pub trait ReadWrite: Sized {
@@ -162,6 +162,8 @@ impl ReadWrite for Packet {
0x06 => Packet::Pose(Object(read_u128(r)?), read_params(r)?),
0x07 => Packet::Parent(Object(read_u128(r)?), Object(read_u128(r)?)),
0x08 => Packet::Sound(Object(read_u128(r)?), Data::read(r)?),
+ 0x09 => Packet::PrefabIndex(Resource::read(r)?),
+ 0x0a => Packet::PrefabName(Resource::read(r)?, String::read(r)?),
_ => {
for _ in 0..packet_len.max(1) - 1 {
r.read_exact(&mut [0])?;
diff --git a/shared/src/resources.rs b/shared/src/resources.rs
index d22e3ea..95f42e4 100644
--- a/shared/src/resources.rs
+++ b/shared/src/resources.rs
@@ -19,7 +19,7 @@ use anyhow::Result;
use glam::{Affine3A, Vec3A};
use log::warn;
use std::{
- collections::{BTreeMap, HashMap},
+ collections::BTreeMap,
io::{Read, Write},
};
@@ -67,7 +67,7 @@ pub struct MeshPart {
}
#[derive(Debug, Default, Clone)]
-pub struct PrefabIndex(pub BTreeMap<String, Resource>);
+pub struct PrefabIndex(pub BTreeMap<String, Resource<Prefab>>);
#[derive(Debug, Default, Clone)]
pub struct AttributeArray(pub Vec<f32>);