Implemented attackertext

diff --git a/qcsrc/client/hud/panel/infomessages.qc b/qcsrc/client/hud/panel/infomessages.qc
index 03465cce56185d26267368b5c6043f57a435fc0d..a5322f93bdf6bcb0b74a7a5fc1348849a848c3e2 100644 (file)
--- a/qcsrc/client/hud/panel/infomessages.qc
+++ b/qcsrc/client/hud/panel/infomessages.qc
@@ -122,15 +122,15 @@ void HUD_InfoMessages()
                                InfoMessage(s);
                        }
 
-                       bool mutator_returnvalue = MUTATOR_CALLHOOK(DrawInfoMessages, pos, mySize, img_curr_group);
+                       //bool mutator_returnvalue = MUTATOR_CALLHOOK(DrawInfoMessages, pos, mySize, img_curr_group);
                        pos = M_ARGV(0, vector);
                        img_curr_group = M_ARGV(2, int);
 
-                       if(!mutator_returnvalue)
-                       {
+                       //if(!mutator_returnvalue)
+                       //{
                                s = sprintf(_("^1Press ^3%s^1 to join"), getcommandkey(_("jump"), "+jump"));
                                InfoMessage(s);
-                       }
+                       //}
                }
 
                if (time < STAT(GAMESTARTTIME))
@@ -220,6 +220,9 @@ void HUD_InfoMessages()
                                InfoMessage(s);
                        }
                }
+
+               // z411
+               MUTATOR_CALLHOOK(DrawInfoMessages, pos, mySize, img_curr_group);
        }
        else
        {

diff --git a/qcsrc/common/mutators/mutator/_mod.inc b/qcsrc/common/mutators/mutator/_mod.inc
index 40a763c8ec04b39b9a39dfb3d8d915bf647e1324..1479a1dfa1f97ac27d196434e54882ffd6029168 100644 (file)
--- a/qcsrc/common/mutators/mutator/_mod.inc
+++ b/qcsrc/common/mutators/mutator/_mod.inc
@@ -1,5 +1,6 @@
 // generated file; do not modify
 
+#include <common/mutators/mutator/attackertext/_mod.inc>
 #include <common/mutators/mutator/bloodloss/_mod.inc>
 #include <common/mutators/mutator/breakablehook/_mod.inc>
 #include <common/mutators/mutator/buffs/_mod.inc>

diff --git a/qcsrc/common/mutators/mutator/_mod.qh b/qcsrc/common/mutators/mutator/_mod.qh
index 6a9261dd41f394cd3496bf119ec6fa92e6ebb0f1..4654958287e9ffb570ec90fe05dc7be92d3cbdfd 100644 (file)
--- a/qcsrc/common/mutators/mutator/_mod.qh
+++ b/qcsrc/common/mutators/mutator/_mod.qh
@@ -4,6 +4,7 @@
 #include <common/mutators/mutator/breakablehook/_mod.qh>
 #include <common/mutators/mutator/buffs/_mod.qh>
 #include <common/mutators/mutator/bugrigs/_mod.qh>
+#include <common/mutators/mutator/attackertext/_mod.qh>
 #include <common/mutators/mutator/campcheck/_mod.qh>
 #include <common/mutators/mutator/cloaked/_mod.qh>
 #include <common/mutators/mutator/damagetext/_mod.qh>

diff --git a/qcsrc/common/mutators/mutator/attackertext/_mod.inc b/qcsrc/common/mutators/mutator/attackertext/_mod.inc
new file mode 100644 (file)
index 0000000..52b56df
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/attackertext/_mod.inc
@@ -0,0 +1,8 @@
+// generated file; do not modify
+#include <common/mutators/mutator/attackertext/attackertext.qc>
+#ifdef CSQC
+    #include <common/mutators/mutator/attackertext/cl_attackertext.qc>
+#endif
+#ifdef SVQC
+    #include <common/mutators/mutator/attackertext/sv_attackertext.qc>
+#endif

diff --git a/qcsrc/common/mutators/mutator/attackertext/_mod.qh b/qcsrc/common/mutators/mutator/attackertext/_mod.qh
new file mode 100644 (file)
index 0000000..e712e37
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/attackertext/_mod.qh
@@ -0,0 +1,11 @@
+// generated file; do not modify
+#include <common/mutators/mutator/damagetext/damagetext.qh>
+#ifdef CSQC
+    #include <common/mutators/mutator/damagetext/cl_damagetext.qh>
+#endif
+#ifdef SVQC
+    #include <common/mutators/mutator/damagetext/sv_damagetext.qh>
+#endif
+#ifdef MENUQC
+    #include <common/mutators/mutator/damagetext/ui_damagetext.qh>
+#endif

diff --git a/qcsrc/common/mutators/mutator/attackertext/attackertext.qc b/qcsrc/common/mutators/mutator/attackertext/attackertext.qc
new file mode 100644 (file)
index 0000000..dafd533
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/attackertext/attackertext.qc
@@ -0,0 +1,3 @@
+#include "attackertext.qh"
+
+REGISTER_NET_TEMP(attackertext)

diff --git a/qcsrc/common/mutators/mutator/attackertext/attackertext.qh b/qcsrc/common/mutators/mutator/attackertext/attackertext.qh
new file mode 100644 (file)
index 0000000..96d63a7
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/attackertext/attackertext.qh
@@ -0,0 +1,4 @@
+#pragma once
+
+const int ATFLAG_SAMETEAM = BIT(0);
+

diff --git a/qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qc b/qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qc
new file mode 100644 (file)
index 0000000..2e5dee7
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qc
@@ -0,0 +1,61 @@
+#include "cl_attackertext.qh"
+
+AUTOCVAR_SAVE(cl_attackertext,                        bool,   true,       "Draw damage dealt where you hit the enemy");
+AUTOCVAR_SAVE(cl_attackertext_friendlyfire,           bool,   false,      "Show for friendlyfire");
+AUTOCVAR_SAVE(cl_attackertext_time,                   float,  3,          "Time to show");
+AUTOCVAR_SAVE(cl_attackertext_fadetime,               float,  2,          "Time to fade");
+AUTOCVAR_SAVE(cl_attackertext_decolorize,             int,    1,          "1 = decolorize names when teamplay, 2 = decolorize always");
+
+REGISTER_MUTATOR(attackertext, true);
+
+MUTATOR_HOOKFUNCTION(attackertext, DrawInfoMessages)
+{
+       if (autocvar_cl_attackertext == 0) return false;
+       
+       float fade_start = max(0, autocvar_cl_attackertext_time);
+       float fade_time = max(0, autocvar_cl_attackertext_fadetime);
+               
+       if (last_attack_time && last_attack_time > time - fade_start - fade_time) {
+               vector pos = M_ARGV(0, vector);
+               vector mySize = M_ARGV(1, vector);
+               vector fontsize = '0.2 0.2 0' * mySize.y;
+               int img_curr_group = M_ARGV(2, int);
+               
+               float alpha_ = 0;
+               
+               if (last_attack_time + fade_start > time)
+                       alpha_ = panel_fg_alpha;
+               else if (fade_time != 0)
+                       alpha_ = panel_fg_alpha - bound(0, (time - last_attack_time - fade_start) * (1 / fade_time), 1);
+               else
+                       return true;
+                       
+               pos = InfoMessages_drawstring(last_attack_name, pos, mySize, alpha_, fontsize);
+               img_curr_group = -1;
+
+               return true;
+       }
+               
+       return false;
+}
+
+
+NET_HANDLE(attackertext, bool isNew)
+{
+    int server_entity_index = ReadByte();
+       int flags = ReadByte();
+    bool friendlyfire = flags & ATFLAG_SAMETEAM;
+       
+       return = true;
+       
+    if (autocvar_cl_attackertext == 0) return;
+    if (friendlyfire && autocvar_cl_attackertext_friendlyfire == 0) return;
+       
+       string s = entcs_GetName(server_entity_index - 1);
+       if ((autocvar_cl_attackertext_decolorize == 1 && teamplay) || autocvar_cl_attackertext_decolorize == 2)
+               s = playername(s, entcs_GetTeam(server_entity_index - 1));
+
+       last_attack_time = time;
+       strfree(last_attack_name);
+       strcpy(last_attack_name, s);
+}

diff --git a/qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qh b/qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qh
new file mode 100644 (file)
index 0000000..c2c6d6e
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qh
@@ -0,0 +1,4 @@
+#pragma once
+
+float last_attack_time;
+string last_attack_name;
\ No newline at end of file

diff --git a/qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qc b/qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qc
new file mode 100644 (file)
index 0000000..59b0865
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qc
@@ -0,0 +1,25 @@
+#include "sv_attackertext.qh"
+
+AUTOCVAR(sv_attackertext, int, 1, "0: disabled, 1: visible");
+
+REGISTER_MUTATOR(attackertext, true);
+
+#define SV_ATTACKERTEXT_DISABLED()        (autocvar_sv_attackertext <= 0)
+#define SV_ATTACKERTEXT_ENABLED()         (autocvar_sv_attackertext >= 1)
+
+MUTATOR_HOOKFUNCTION(attackertext, PlayerDamaged) {
+    if (SV_ATTACKERTEXT_DISABLED()) return;
+       
+    entity attacker = M_ARGV(0, entity);
+    entity hit = M_ARGV(1, entity); if (hit == attacker) return;
+       
+       if (!IS_REAL_CLIENT(hit) || !IS_PLAYER(attacker)) return;
+       
+       int flags = 0;
+       if (SAME_TEAM(hit, attacker)) flags |= ATFLAG_SAMETEAM;
+       
+       msg_entity = hit;
+       WriteHeader(MSG_ONE, attackertext);
+       WriteByte(MSG_ONE, etof(attacker));
+       WriteByte(MSG_ONE, flags);
+}

diff --git a/qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qh b/qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qh
@@ -0,0 +1 @@
+#pragma once