Don't apply mirror damage penalty and don't play typehit sound and team damage sound...

diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc
index 56851c07464187b7c1fc7ba345ab22661c29cf61..b0270d8cd78545d0ce6b5b946af2b3f0c67ce978 100644 (file)
--- a/data/qcsrc/server/g_damage.qc
+++ b/data/qcsrc/server/g_damage.qc
@@ -730,7 +730,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                                                {\r
                                                        teamdamage0 = max(attacker.dmg_team, cvar("g_teamdamage_threshold"));\r
                                                        attacker.dmg_team = attacker.dmg_team + damage;\r
-                                                       if(attacker.dmg_team > teamdamage0 && !g_ca)\r
+                                                       if(attacker.dmg_team > teamdamage0 && !g_ca && deathtype != DEATH_REGURGITATION)\r
                                                                mirrordamage = cvar("g_mirrordamage") * (attacker.dmg_team - teamdamage0);\r
                                                        mirrorforce = cvar("g_mirrordamage") * vlen(force);\r
                                                        if(g_ca)\r
@@ -860,7 +860,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                                                }\r
                                        }\r
                                }\r
-                               else\r
+                               else if(deathtype != DEATH_REGURGITATION)\r
                                {\r
                                        if(deathtype != DEATH_FIRE)\r
                                                attacker.typehitsound += 1;\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 15e19f0b9773cb090614a6161f79bcd0a12f4a25..789c56f7ee3957b6bf2696dd16cdd192148ebc9c 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -158,9 +158,7 @@
 \r
 - 0.8: Allow free camera rotation in the belly (no pitch bounds)\r
 \r
-- 0.7 | 0.8: Don't play the friendly fire damage sound when you are regurgitated by a team mate. Also don't play the "same team" taunt\r
-\r
-- 0.8: But AI: Stop moving if someone is trying to teamheal us (if we can detact who's swallowing)\r
+- 0.8: Bot AI: Stop moving if someone is trying to teamheal us (if we can detact who's swallowing)\r
 \r
 - 0.8: Fonic helper for speed: Account healthsize in danger detection\r
 \r