From ff324d59577097b94a61a4c444f759d5f64d8c47 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 8 Sep 2023 16:32:47 +0200 Subject: [PATCH] don't store raw_props that we don't need --- src/demo/message/packetentities.rs | 2 -- src/demo/packet/datatable.rs | 1 - src/demo/parser/handler.rs | 2 +- src/demo/parser/state.rs | 5 ++--- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/demo/message/packetentities.rs b/src/demo/message/packetentities.rs index 5051d3f..475e3e9 100644 --- a/src/demo/message/packetentities.rs +++ b/src/demo/message/packetentities.rs @@ -562,13 +562,11 @@ fn test_packet_entitier_message_roundtrip() { SendTable { name: SendTableName::from("table1"), needs_decoder: false, - raw_props: vec![], flattened_props: vec![], }, SendTable { name: SendTableName::from("table2"), needs_decoder: false, - raw_props: vec![], flattened_props: vec![ SendPropDefinition { identifier: SendPropIdentifier::new("table2", "prop1"), diff --git a/src/demo/packet/datatable.rs b/src/demo/packet/datatable.rs index 5301492..9742bd4 100644 --- a/src/demo/packet/datatable.rs +++ b/src/demo/packet/datatable.rs @@ -432,7 +432,6 @@ impl ParseSendTable { pub struct SendTable { pub name: SendTableName, pub needs_decoder: bool, - pub raw_props: Vec, pub flattened_props: Vec, } diff --git a/src/demo/parser/handler.rs b/src/demo/parser/handler.rs index 8fdfd19..76557b9 100644 --- a/src/demo/parser/handler.rs +++ b/src/demo/parser/handler.rs @@ -189,7 +189,7 @@ impl DemoHandler { self.analyser .handle_data_tables(&send_tables, &server_classes, &self.state_handler); self.state_handler - .handle_data_table(send_tables, server_classes) + .handle_data_table(&send_tables, server_classes) } pub fn handle_message(&mut self, message: Message, tick: DemoTick) { diff --git a/src/demo/parser/state.rs b/src/demo/parser/state.rs index d2e94ed..c56fb8b 100644 --- a/src/demo/parser/state.rs +++ b/src/demo/parser/state.rs @@ -160,20 +160,19 @@ impl<'a> ParserState { pub fn handle_data_table( &mut self, - parse_tables: Vec, + parse_tables: &[ParseSendTable], server_classes: Vec, ) -> Result<()> { if self.handle_entities { let mut send_tables: FnvHashMap = parse_tables .iter() .map(|parse_table| { - let flat = parse_table.flatten_props(&parse_tables); + let flat = parse_table.flatten_props(parse_tables); Ok(( parse_table.name.clone(), SendTable { name: parse_table.name.clone(), needs_decoder: parse_table.needs_decoder, - raw_props: parse_table.props.clone(), flattened_props: flat?, }, ))