Go a bit through the mutators. Fix a bug with one, and note a big with another

[voretournament/voretournament.git] / data / qcsrc / server / g_damage.qc

diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc
index 2d90a893359552a2675946cea7fce09004b08aa6..0562a14496616fb67e37862459784f79b512e845 100644 (file)
--- a/data/qcsrc/server/g_damage.qc
+++ b/data/qcsrc/server/g_damage.qc
@@ -310,7 +310,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                                centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Furfag! You made a meal out of a team mate!"));\r
                                                bprint ("^1", a, "^1 took action against a team mate\n");\r
                                        } else {\r
-                                               centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Furfag! You vored ", s, ", a team mate!"));\r
+                                               centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Furfag! You ate ", s, ", a team mate!"));\r
                                                bprint ("^1", a, "^1 mows down a team mate\n");\r
                                        }\r
                                }\r
@@ -367,11 +367,11 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                                centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, a,"^1 made you their meal ^7", GetAdvancedDeathReports(attacker)));\r
                                        } else {\r
                                                if((cvar("sv_fragmessage_information_typefrag")) && (targ.BUTTON_CHAT)) {\r
-                                                       centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^1You typevored ^7", s, GetAdvancedDeathReports(targ)));\r
-                                                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were typevored by ^7", a, GetAdvancedDeathReports(attacker)));\r
+                                                       centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^1You typeate ^7", s, GetAdvancedDeathReports(targ)));\r
+                                                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were typeeaten by ^7", a, GetAdvancedDeathReports(attacker)));\r
                                                } else {\r
-                                                       centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You vored ^7", s, GetAdvancedDeathReports(targ)));\r
-                                                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were vored by ^7", a, GetAdvancedDeathReports(attacker)));\r
+                                                       centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You ate ^7", s, GetAdvancedDeathReports(targ)));\r
+                                                       centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were eaten by ^7", a, GetAdvancedDeathReports(attacker)));\r
                                                }\r
                                                attacker.taunt_soundtime = time + 1;\r
                                        }\r
@@ -859,6 +859,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                // Savage: vampire mode\r
                if (g_vampire)\r
                if (time >= self.spawnshieldtime)\r
+               if (deathtype != DEATH_DIGESTION) // a different vampire system is used for this\r
                {\r
                        attacker.health += damage;\r
                }\r