jake/libpso
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'issue_060' of jake/libpso into master

Browse Source
This commit is contained in:
jake 2020-01-09 22:45:51 -05:00 committed by Gogs
commit c3f91163a7
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/packet/messages.rs
View File

@ -88,6 +88,21 @@ pub struct UnknownAE {
unknown3: u32, unknown3: u32,
} }
#[pso_message(0xAB)]
pub struct PhotonChairSit {
unknown1: u32,
}
#[pso_message(0xAF)]
pub struct PhotonChairTurn {
unknown1: u32,
}
#[pso_message(0xB0)]
pub struct PhotonChairMove {
unknown1: u32,
}
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
@ -103,6 +118,9 @@ pub enum GameMessage {
LobbyEmote(LobbyEmote), LobbyEmote(LobbyEmote),
TalkToNpc(TalkToNpc), TalkToNpc(TalkToNpc),
UnknownAE(UnknownAE), UnknownAE(UnknownAE),
PhotonChairSit(PhotonChairSit),
PhotonChairTurn(PhotonChairTurn),
PhotonChairMove(PhotonChairMove),
} }
impl PSOPacketData for GameMessage { impl PSOPacketData for GameMessage {
@ -124,6 +142,9 @@ impl PSOPacketData for GameMessage {
LobbyEmote::CMD => Ok(GameMessage::LobbyEmote(LobbyEmote::from_bytes(&mut cur)?)), LobbyEmote::CMD => Ok(GameMessage::LobbyEmote(LobbyEmote::from_bytes(&mut cur)?)),
TalkToNpc::CMD => Ok(GameMessage::TalkToNpc(TalkToNpc::from_bytes(&mut cur)?)), TalkToNpc::CMD => Ok(GameMessage::TalkToNpc(TalkToNpc::from_bytes(&mut cur)?)),
UnknownAE::CMD => Ok(GameMessage::UnknownAE(UnknownAE::from_bytes(&mut cur)?)), UnknownAE::CMD => Ok(GameMessage::UnknownAE(UnknownAE::from_bytes(&mut cur)?)),
PhotonChairSit::CMD => Ok(GameMessage::PhotonChairSit(PhotonChairSit::from_bytes(&mut cur)?)),
PhotonChairTurn::CMD => Ok(GameMessage::PhotonChairTurn(PhotonChairTurn::from_bytes(&mut cur)?)),
PhotonChairMove::CMD => Ok(GameMessage::PhotonChairMove(PhotonChairMove::from_bytes(&mut cur)?)),
_ => Err(PacketParseError::UnknownMessage(byte[0], _ => Err(PacketParseError::UnknownMessage(byte[0],
{ {
let mut b = vec![0; len[0] as usize * 4]; let mut b = vec![0; len[0] as usize * 4];
@ -146,6 +167,9 @@ impl PSOPacketData for GameMessage {
GameMessage::LobbyEmote(data) => data.as_bytes(), GameMessage::LobbyEmote(data) => data.as_bytes(),
GameMessage::TalkToNpc(data) => data.as_bytes(), GameMessage::TalkToNpc(data) => data.as_bytes(),
GameMessage::UnknownAE(data) => data.as_bytes(), GameMessage::UnknownAE(data) => data.as_bytes(),
GameMessage::PhotonChairSit(data) => data.as_bytes(),
GameMessage::PhotonChairTurn(data) => data.as_bytes(),
GameMessage::PhotonChairMove(data) => data.as_bytes(),
} }
} }
} }