mirror of
https://github.com/redstrate/Kawari.git
synced 2025-06-30 11:47:45 +00:00
Show emotes from other players
If you move it doesn't cancel them yet, but still cool to see them play.
This commit is contained in:
parent
77b6fbad7f
commit
e1b01299c9
3 changed files with 22 additions and 0 deletions
|
@ -95,6 +95,11 @@ pub enum ActorControlCategory {
|
|||
#[bw(map = write_bool_as::<u32>)]
|
||||
unlocked: bool,
|
||||
},
|
||||
#[brw(magic = 0x122u16)]
|
||||
Emote {
|
||||
#[brw(pad_before = 2)] // padding
|
||||
emote: u32,
|
||||
},
|
||||
}
|
||||
|
||||
#[binrw]
|
||||
|
|
|
@ -12,6 +12,11 @@ pub enum ClientTriggerCommand {
|
|||
Unk1 {},
|
||||
#[brw(magic = 0xC9u16)]
|
||||
Unk2 {},
|
||||
#[brw(magic = 0x1F4u16)]
|
||||
Emote {
|
||||
#[brw(pad_before = 2)] // padding
|
||||
emote: u32,
|
||||
},
|
||||
#[brw(magic = 0x1F9u16)]
|
||||
ChangePose {
|
||||
#[brw(pad_before = 2)] // padding
|
||||
|
|
|
@ -376,6 +376,18 @@ pub async fn server_main_loop(mut recv: Receiver<ToServer>) -> Result<(), std::i
|
|||
to_remove.push(id);
|
||||
}
|
||||
}
|
||||
ClientTriggerCommand::Emote { emote } => {
|
||||
let msg = FromServer::ActorControl(
|
||||
from_actor_id,
|
||||
ActorControl {
|
||||
category: ActorControlCategory::Emote { emote: *emote },
|
||||
},
|
||||
);
|
||||
|
||||
if handle.send(msg).is_err() {
|
||||
to_remove.push(id);
|
||||
}
|
||||
}
|
||||
_ => tracing::warn!("Server doesn't know what to do with {:#?}", trigger),
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue