From 099bddb183122fe8493fe22a29aaee0287e47855 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Mon, 6 Sep 2010 02:10:42 +0300 Subject: [PATCH] As a wise furry said: "Vored" isn't really a correct word --- data/qcsrc/server/g_damage.qc | 10 +++++----- data/qcsrc/server/vore.qc | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc index 2d90a893..d86a49b8 100644 --- 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!")); bprint ("^1", a, "^1 took action against a team mate\n"); } else { - centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Furfag! You vored ", s, ", a team mate!")); + centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, "^1Furfag! You ate ", s, ", a team mate!")); bprint ("^1", a, "^1 mows down a team mate\n"); } } @@ -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))); } else { if((cvar("sv_fragmessage_information_typefrag")) && (targ.BUTTON_CHAT)) { - centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^1You typevored ^7", s, GetAdvancedDeathReports(targ))); - centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were typevored by ^7", a, GetAdvancedDeathReports(attacker))); + centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^1You typeate ^7", s, GetAdvancedDeathReports(targ))); + centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were typeeaten by ^7", a, GetAdvancedDeathReports(attacker))); } else { - centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You vored ^7", s, GetAdvancedDeathReports(targ))); - centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were vored by ^7", a, GetAdvancedDeathReports(attacker))); + centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You ate ^7", s, GetAdvancedDeathReports(targ))); + centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were eaten by ^7", a, GetAdvancedDeathReports(attacker))); } attacker.taunt_soundtime = time + 1; } diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 1a3fa9e4..9dfb21fe 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -74,6 +74,7 @@ void Vore_CameraEffect_Apply() local float step; step = self.cvar_cl_vore_cameraspeed * frametime; + // not sure if these maths are good, as the effect should be smoother if(self.cameraeffect_current >= self.cameraeffect_target + step) self.cameraeffect_current -= step; else if(self.cameraeffect_current <= self.cameraeffect_target - step) -- 2.39.2