Merge branch 'master' into Mario/vaporizer_damage

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_player.qc

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index fe81364953d478321ab153c62ce45ad07218ae2c..6310d7ff3ef3cb6daeefb423615dc0f8187161a7 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -1,10 +1,29 @@
 #include "cl_player.qh"
 #include "cl_player.qh"

-#include "g_triggers.qh"
+#include "_all.qh"
+
+#include "bot/bot.qh"
+#include "cheats.qh"
+#include "g_damage.qh"
+#include "g_subs.qh"

 #include "g_violence.qh"
 #include "miscfunctions.qh"
 #include "g_violence.qh"
 #include "miscfunctions.qh"

+#include "portals.qh"
+#include "teamplay.qh"
+#include "weapons/throwing.qh"
+#include "command/common.qh"
+#include "../common/animdecide.qh"
+#include "../common/csqcmodel_settings.qh"
+#include "../common/deathtypes.qh"
+#include "../common/triggers/subs.qh"
+#include "../common/playerstats.qh"
+#include "../csqcmodellib/sv_model.qh"
+
+#include "../common/minigames/sv_minigames.qh"

 
 #include "weapons/weaponstats.qh"
 
 
 #include "weapons/weaponstats.qh"
 

+#include "../common/animdecide.qh"
+

 void CopyBody_Think(void)
 {
        if(self.CopyBody_nextthink && time > self.CopyBody_nextthink)
 void CopyBody_Think(void)
 {
        if(self.CopyBody_nextthink && time > self.CopyBody_nextthink)


@@ -134,6 +153,8 @@ void player_anim (void)
        int animbits = deadbits;
        if(self.frozen)
                animbits |= ANIMSTATE_FROZEN;
        int animbits = deadbits;
        if(self.frozen)
                animbits |= ANIMSTATE_FROZEN;

+       if(self.movetype == MOVETYPE_FOLLOW)
+               animbits |= ANIMSTATE_FOLLOW;

        if(self.crouch)
                animbits |= ANIMSTATE_DUCK;
        animdecide_setstate(self, animbits, false);
        if(self.crouch)
                animbits |= ANIMSTATE_DUCK;
        animdecide_setstate(self, animbits, false);


@@ -147,7 +168,7 @@ void player_anim (void)
        }
 }
 
        }
 }
 

-void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)

 {
        float take, save;
        vector v;
 {
        float take, save;
        vector v;


@@ -304,7 +325,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, int deathtyp
                        damage /= sqrt(bound(1.0, attacker.cvar_cl_handicap, 100.0));
        }
 
                        damage /= sqrt(bound(1.0, attacker.cvar_cl_handicap, 100.0));
        }
 

-       if(DEATH_ISWEAPON(deathtype, WEP_TUBA))
+       if(DEATH_ISWEAPON(deathtype, WEP_TUBA.m_id))

        {
                // tuba causes blood to come out of the ears
                vector ear1, ear2;
        {
                // tuba causes blood to come out of the ears
                vector ear1, ear2;


@@ -367,14 +388,8 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, int deathtyp
                self.istypefrag = 0;
        }
 
                self.istypefrag = 0;
        }
 

-       frag_inflictor = inflictor;
-       frag_attacker = attacker;
-       frag_target = self;

        frag_damage = damage;
        frag_damage = damage;

-       damage_take = take;
-       damage_save = save;
-       damage_force = force;
-       MUTATOR_CALLHOOK(PlayerDamage_SplitHealthArmor);
+       MUTATOR_CALLHOOK(PlayerDamage_SplitHealthArmor, inflictor, attacker, self, force, take, save);

        take = bound(0, damage_take, self.health);
        save = bound(0, damage_save, self.armorvalue);
        excess = max(0, damage - take - save);
        take = bound(0, damage_take, self.health);
        save = bound(0, damage_save, self.armorvalue);
        excess = max(0, damage - take - save);


@@ -480,6 +495,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, int deathtyp
                dh = dh - max(self.health, 0);
                da = da - max(self.armorvalue, 0);
                WeaponStats_LogDamage(awep, abot, self.weapon, vbot, dh + da);
                dh = dh - max(self.health, 0);
                da = da - max(self.armorvalue, 0);
                WeaponStats_LogDamage(awep, abot, self.weapon, vbot, dh + da);

+               MUTATOR_CALLHOOK(PlayerDamaged, attacker, self, dh, da, hitloc);

        }
 
        if (self.health < 1)
        }
 
        if (self.health < 1)


@@ -517,7 +533,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, int deathtyp
                        if(deathtype == DEATH_KILL)
                        {
                                // for the lemmings fans, a small harmless explosion
                        if(deathtype == DEATH_KILL)
                        {
                                // for the lemmings fans, a small harmless explosion

-                               pointparticles(particleeffectnum("rocket_explode"), self.origin, '0 0 0', 1);
+                               Send_Effect(EFFECT_ROCKET_EXPLODE, self.origin, '0 0 0', 1);

                        }
                }
 
                        }
                }
 


@@ -531,12 +547,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, int deathtyp
        if(accuracy_isgooddamage(attacker, self))
         attacker.accuracy.(accuracy_frags[w-1]) += 1;
 
        if(accuracy_isgooddamage(attacker, self))
         attacker.accuracy.(accuracy_frags[w-1]) += 1;
 

-               frag_attacker = attacker;
-               frag_inflictor = inflictor;
-               frag_target = self;
-               frag_damage = excess;
-               frag_deathtype = deathtype;
-               MUTATOR_CALLHOOK(PlayerDies);
+               MUTATOR_CALLHOOK(PlayerDies, inflictor, attacker, self, deathtype);

                excess = frag_damage;
 
                WEP_ACTION(self.weapon, WR_PLAYERDEATH);
                excess = frag_damage;
 
                WEP_ACTION(self.weapon, WR_PLAYERDEATH);


@@ -699,12 +710,28 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
                }
                else if(teamsay)
                {
                }
                else if(teamsay)
                {

-                       msgstr = strcat("\{1}\{13}", colorstr, "(", colorprefix, namestr, colorstr, ") ^7", msgin);
+                       if(strstrofs(msgin, "/me", 0) >= 0)
+                       {
+                               //msgin = strreplace("/me", "", msgin);
+                               //msgin = substring(msgin, 3, strlen(msgin));
+                               msgin = strreplace("/me", strcat(colorstr, "(", colorprefix, namestr, colorstr, ")^7"), msgin);
+                               msgstr = strcat("\{1}\{13}^4* ", "^7", msgin);
+                       }
+                       else
+                               msgstr = strcat("\{1}\{13}", colorstr, "(", colorprefix, namestr, colorstr, ") ^7", msgin);

                        cmsgstr = strcat(colorstr, "(", colorprefix, namestr, colorstr, ")\n^7", msgin);
                }
                else
                {
                        cmsgstr = strcat(colorstr, "(", colorprefix, namestr, colorstr, ")\n^7", msgin);
                }
                else
                {

-                       msgstr = strcat("\{1}", colorprefix, namestr, "^7: ", msgin);
+                       if(strstrofs(msgin, "/me", 0) >= 0)
+                       {
+                               //msgin = strreplace("/me", "", msgin);
+                               //msgin = substring(msgin, 3, strlen(msgin));
+                               msgin = strreplace("/me", strcat(colorprefix, namestr), msgin);
+                               msgstr = strcat("\{1}^4* ", "^7", msgin);
+                       }
+                       else
+                               msgstr = strcat("\{1}", colorprefix, namestr, "^7: ", msgin);

                        cmsgstr = "";
                }
                msgstr = strcat(strreplace("\n", " ", msgstr), "\n"); // newlines only are good for centerprint
                        cmsgstr = "";
                }
                msgstr = strcat(strreplace("\n", " ", msgstr), "\n"); // newlines only are good for centerprint


@@ -769,9 +796,9 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
                                flood = 2;
                        }
 
                                flood = 2;
                        }
 

-                       if(time >= source.flood_field)
+                       if (time >= source.(flood_field))

                        {
                        {

-                               source.flood_field = max(time - flood_burst * flood_spl, source.flood_field) + lines * flood_spl;
+                               source.(flood_field) = max(time - flood_burst * flood_spl, source.(flood_field)) + lines * flood_spl;

                        }
                        else
                        {
                        }
                        else
                        {


@@ -781,14 +808,14 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
                }
                else
                {
                }
                else
                {

-                       if(time >= source.flood_field)
-                               source.flood_field = max(time - flood_burst * flood_spl, source.flood_field) + flood_spl;
+                       if (time >= source.(flood_field))
+                               source.(flood_field) = max(time - flood_burst * flood_spl, source.(flood_field)) + flood_spl;

                        else
                                flood = 1;
                }
 
                if (timeout_status == TIMEOUT_ACTIVE) // when game is paused, no flood protection
                        else
                                flood = 1;
                }
 
                if (timeout_status == TIMEOUT_ACTIVE) // when game is paused, no flood protection

-                       source.flood_field = flood = 0;
+                       source.(flood_field) = flood = 0;

        }
 
        if(flood == 2) // cannot happen for empty msgstr
        }
 
        if(flood == 2) // cannot happen for empty msgstr


@@ -820,7 +847,7 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
        }
 
        if(flood)
        }
 
        if(flood)

-               print("NOTE: ", playername(source), "^7 is flooding.\n");
+               LOG_INFO("NOTE: ", playername(source), "^7 is flooding.\n");

 
        // build sourcemsgstr by cutting off a prefix and replacing it by the other one
        if(privatesay)
 
        // build sourcemsgstr by cutting off a prefix and replacing it by the other one
        if(privatesay)


@@ -833,9 +860,9 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
        }
        else if(flood == 1)
        {
        }
        else if(flood == 1)
        {

-               if(autocvar_g_chat_flood_notify_flooder)
+               if (autocvar_g_chat_flood_notify_flooder)

                {
                {

-                       sprint(source, strcat("^3FLOOD CONTROL: ^7wait ^1", ftos(source.flood_field - time), "^3 seconds\n"));
+                       sprint(source, strcat("^3FLOOD CONTROL: ^7wait ^1", ftos(source.(flood_field) - time), "^3 seconds\n"));

                        ret = 0;
                }
                else
                        ret = 0;
                }
                else


@@ -862,6 +889,15 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
                        if(cmsgstr != "")
                                centerprint(privatesay, cmsgstr);
                }
                        if(cmsgstr != "")
                                centerprint(privatesay, cmsgstr);
                }

+               else if ( teamsay && source.active_minigame )
+               {
+                       sprint(source, sourcemsgstr);
+                       dedicated_print(msgstr); // send to server console too
+                       FOR_EACH_REALCLIENT(head) 
+                               if(head != source)
+                               if(head.active_minigame == source.active_minigame)
+                                       sprint(head, msgstr);
+               }

                else if(teamsay > 0) // team message, only sent to team mates
                {
                        sprint(source, sourcemsgstr);
                else if(teamsay > 0) // team message, only sent to team mates
                {
                        sprint(source, sourcemsgstr);


@@ -961,7 +997,7 @@ void PrecachePlayerSounds(string f)
        {
                if(tokenize_console(s) != 3)
                {
        {
                if(tokenize_console(s) != 3)
                {

-                       dprint("Invalid sound info line: ", s, "\n");
+                       LOG_TRACE("Invalid sound info line: ", s, "\n");

                        continue;
                }
                PrecacheGlobalSound(strcat(argv(1), " ", argv(2)));
                        continue;
                }
                PrecacheGlobalSound(strcat(argv(1), " ", argv(2)));


@@ -993,7 +1029,7 @@ float LoadPlayerSounds(string f, float first)
        fh = fopen(f, FILE_READ);
        if(fh < 0)
        {
        fh = fopen(f, FILE_READ);
        if(fh < 0)
        {

-               dprint("Player sound file not found: ", f, "\n");
+               LOG_TRACE("Player sound file not found: ", f, "\n");

                return 0;
        }
        while((s = fgets(fh)))
                return 0;
        }
        while((s = fgets(fh)))


@@ -1005,9 +1041,9 @@ float LoadPlayerSounds(string f, float first)
                        field = GetVoiceMessageSampleField(argv(0));
                if(GetPlayerSoundSampleField_notFound)
                        continue;
                        field = GetVoiceMessageSampleField(argv(0));
                if(GetPlayerSoundSampleField_notFound)
                        continue;

-               if(self.field)
-                       strunzone(self.field);
-               self.field = strzone(strcat(argv(1), " ", argv(2)));
+               if (self.(field))
+                       strunzone(self.(field));
+               self.(field) = strzone(strcat(argv(1), " ", argv(2)));

        }
        fclose(fh);
        return 1;
        }
        fclose(fh);
        return 1;


@@ -1202,7 +1238,7 @@ void GlobalSound(string sample, float chan, float voicetype)
 
 void PlayerSound(.string samplefield, float chan, float voicetype)
 {
 
 void PlayerSound(.string samplefield, float chan, float voicetype)
 {

-       GlobalSound(self.samplefield, chan, voicetype);
+       GlobalSound(self.(samplefield), chan, voicetype);

 }
 
 void VoiceMessage(string type, string msg)
 }
 
 void VoiceMessage(string type, string msg)


@@ -1223,10 +1259,10 @@ void VoiceMessage(string type, string msg)
 
        flood = Say(self, ownteam, world, msg, 1);
 
 
        flood = Say(self, ownteam, world, msg, 1);
 

-       if(IS_SPEC(self) || IS_OBSERVER(self) || flood < 0)
-               FakeGlobalSound(self.sample, CH_VOICE, voicetype);
+       if (IS_SPEC(self) || IS_OBSERVER(self) || flood < 0)
+               FakeGlobalSound(self.(sample), CH_VOICE, voicetype);

        else if (flood > 0)
        else if (flood > 0)

-               GlobalSound(self.sample, CH_VOICE, voicetype);
+               GlobalSound(self.(sample), CH_VOICE, voicetype);

 }
 
 void MoveToTeam(entity client, float team_colour, float type)
 }
 
 void MoveToTeam(entity client, float team_colour, float type)