Adjust message callback types

Zerthox · Jan 20, 2025 · b509916 · b509916
1 parent 2ccc51f
commit b509916
Show file tree

Hide file tree

Showing 9 changed files with 458 additions and 362 deletions.
diff --git a/arcdps/Cargo.toml b/arcdps/Cargo.toml
@@ -12,6 +12,7 @@ license = "MIT"
 [dependencies]
 arcdps_codegen = { path = "../arcdps_codegen" }
 arcdps-imgui = { version = "0.8.0", features = ["tables-api"] }
+bitflags = "2.8.0"
 chrono = { version = "0.4.24", optional = true }
 evtc = { path = "../evtc", features = ["realtime"]}
 log = { version = "0.4.17", features = ["std"], optional = true }

diff --git a/arcdps/src/extras/callbacks.rs b/arcdps/src/extras/callbacks.rs
@@ -2,7 +2,7 @@
 
 use super::{
     keybinds::{KeybindChange, RawKeybindChange},
-    message::{Message, RawMessage, RawMessageType, RawSquadMessage, SquadMessage},
+    message::{Message, MessageType, RawMessage, SquadMessage},
     user::{UserInfo, UserInfoIter},
     ExtrasAddonInfo, ExtrasSubscriberInfo, RawExtrasAddonInfo,
 };
@@ -16,7 +16,7 @@ pub type ExtrasLanguageChangedCallback = fn(language: Language);
 
 pub type ExtrasKeybindChangedCallback = fn(changed: KeybindChange);
 
-pub type ExtrasSquadChatMessageCallback = fn(message: SquadMessage);
+pub type ExtrasSquadChatMessageCallback = fn(message: &SquadMessage);
 
 pub type ExtrasChatMessageCallback = fn(message: Message);
 
@@ -34,8 +34,8 @@ abi! {
     pub type RawExtrasKeybindChangedCallback = unsafe extern fn(changed: RawKeybindChange);
 
     pub type RawExtrasSquadChatMessageCallback =
-        unsafe extern fn(message: *const RawSquadMessage);
+        unsafe extern fn(message: *const SquadMessage);
 
     pub type RawExtrasChatMessageCallback =
-        unsafe extern fn(message_type: RawMessageType, message: RawMessage);
+        unsafe extern fn(message_type: MessageType, message: RawMessage);
 }
diff --git a/arcdps/src/extras/message.rs b/arcdps/src/extras/message.rs