Expose chat messages to the mutator hook, fix hooks not calling EditProjectile

diff --git a/qcsrc/server/chat.qc b/qcsrc/server/chat.qc
index 2e7faa7b15c6f3a9bb0a9e16b0fe833c8900acb8..8bbba21ae9890352d1cb27e86e09ef7b24b86b8c 100644 (file)
--- a/qcsrc/server/chat.qc
+++ b/qcsrc/server/chat.qc
@@ -290,7 +290,7 @@ int Say(entity source, int teamsay, entity privatesay, string msgin, bool floodc
                ret = -1; // just hide the message completely
        }
 
-       MUTATOR_CALLHOOK(ChatMessage, source, ret);
+       MUTATOR_CALLHOOK(ChatMessage, source, ret, sourcemsgstr);
        ret = M_ARGV(1, int);
 
        string event_log_msg = "";

diff --git a/qcsrc/server/hook.qc b/qcsrc/server/hook.qc
index 26753d95ec61c98ac26c8e0187120e333989354b..61a6319b75c74cea0939ca58e5db83d9f0a2b084 100644 (file)
--- a/qcsrc/server/hook.qc
+++ b/qcsrc/server/hook.qc
@@ -367,6 +367,8 @@ void FireGrapplingHook(entity actor, .entity weaponentity)
        missile.hook_start = missile.hook_end = missile.origin;
 
        Net_LinkEntity(missile, false, 0, GrapplingHookSend);
+
+       MUTATOR_CALLHOOK(EditProjectile, actor, missile);
 }
 
 // NOTE: using PRECACHE here to make sure it's called after everything else

diff --git a/qcsrc/server/mutators/events.qh b/qcsrc/server/mutators/events.qh
index 19f84a3a811d0cf281dda985c7cd3c8f07682e80..a89ad13cda14ceed955b1a1ef266f3259c940b9f 100644 (file)
--- a/qcsrc/server/mutators/events.qh
+++ b/qcsrc/server/mutators/events.qh
@@ -1164,6 +1164,7 @@ MUTATOR_HOOKABLE(CopyBody, EV_CopyBody);
     /** sender */ i(entity, MUTATOR_ARGV_0_entity) \
     /** ret */ i(int, MUTATOR_ARGV_1_int) \
     /**/ o(int, MUTATOR_ARGV_1_int) \
+    /** message */ i(string, MUTATOR_ARGV_2_string) \
     /**/
 MUTATOR_HOOKABLE(ChatMessage, EV_ChatMessage);