demostf/parser
1
0
Fork 0
mirror of https://codeberg.org/demostf/parser.git synced 2026-06-03 18:24:05 +02:00
Code Issues Releases Wiki Activity

fix uknown usermessage re-encoding

Browse source
This commit is contained in:
Robin Appelman 2021-07-22 14:22:09 +02:00
commit 48c7fefa82
1 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/demo/message/usermessage.rs
View file

@ -1,4 +1,4 @@
use bitbuffer::{BitRead, BitWrite, BitWriteStream, LittleEndian}; use bitbuffer::{BitError, BitRead, BitWrite, BitWriteStream, LittleEndian};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::demo::handle_utf8_error; use crate::demo::handle_utf8_error;
@ -78,18 +78,18 @@ pub enum UserMessage<'a> {
Train(TrainMessage), Train(TrainMessage),
VoiceSubtitle(VoiceSubtitleMessage), VoiceSubtitle(VoiceSubtitleMessage),
Shake(ShakeMessage), Shake(ShakeMessage),
Unknown(UserMessageType, UnknownUserMessage<'a>), Unknown(u8, UnknownUserMessage<'a>),
} }
impl UserMessage<'_> { impl UserMessage<'_> {
pub fn message_type(&self) -> UserMessageType { pub fn message_type(&self) -> u8 {
match self { match self {
UserMessage::SayText2(_) => UserMessageType::SayText2, UserMessage::SayText2(_) => UserMessageType::SayText2 as u8,
UserMessage::Text(_) => UserMessageType::TextMsg, UserMessage::Text(_) => UserMessageType::TextMsg as u8,
UserMessage::ResetHUD(_) => UserMessageType::ResetHUD, UserMessage::ResetHUD(_) => UserMessageType::ResetHUD as u8,
UserMessage::Train(_) => UserMessageType::Train, UserMessage::Train(_) => UserMessageType::Train as u8,
UserMessage::VoiceSubtitle(_) => UserMessageType::VoiceSubtitle, UserMessage::VoiceSubtitle(_) => UserMessageType::VoiceSubtitle as u8,
UserMessage::Shake(_) => UserMessageType::Shake, UserMessage::Shake(_) => UserMessageType::Shake as u8,
UserMessage::Unknown(ty, _) => *ty, UserMessage::Unknown(ty, _) => *ty,
} }
} }
@ -97,18 +97,28 @@ impl UserMessage<'_> {
impl<'a> BitRead<'a, LittleEndian> for UserMessage<'a> { impl<'a> BitRead<'a, LittleEndian> for UserMessage<'a> {
fn read(stream: &mut Stream<'a>) -> ReadResult<Self> { fn read(stream: &mut Stream<'a>) -> ReadResult<Self> {
let message_type = stream.read().unwrap_or(UserMessageType::Unknown); let message = match stream.read() {
Ok(message_type) => {
let length = stream.read_int(11)?; let length = stream.read_int(11)?;
let mut data = stream.read_bits(length)?; let mut data = stream.read_bits(length)?;
let message = match message_type { match message_type {
UserMessageType::SayText2 => UserMessage::SayText2(data.read()?), UserMessageType::SayText2 => UserMessage::SayText2(data.read()?),
//UserMessageType::TextMsg => UserMessage::Text(data.read()?), //UserMessageType::TextMsg => UserMessage::Text(data.read()?),
UserMessageType::ResetHUD => UserMessage::ResetHUD(data.read()?), UserMessageType::ResetHUD => UserMessage::ResetHUD(data.read()?),
UserMessageType::Train => UserMessage::Train(data.read()?), UserMessageType::Train => UserMessage::Train(data.read()?),
UserMessageType::VoiceSubtitle => UserMessage::VoiceSubtitle(data.read()?), UserMessageType::VoiceSubtitle => UserMessage::VoiceSubtitle(data.read()?),
UserMessageType::Shake => UserMessage::Shake(data.read()?), UserMessageType::Shake => UserMessage::Shake(data.read()?),
_ => UserMessage::Unknown(message_type, data.read()?), _ => UserMessage::Unknown(message_type as u8, data.read()?),
}
}
Err(BitError::UnmatchedDiscriminant { discriminant, .. }) => {
let length = stream.read_int(11)?;
let mut data = stream.read_bits(length)?;
UserMessage::Unknown(discriminant as u8, data.read()?)
}
Err(e) => return Err(e),
}; };
Ok(message) Ok(message)
} }