]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
As a wise furry said: "Vored" isn't really a correct word
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 5 Sep 2010 23:10:42 +0000 (02:10 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 5 Sep 2010 23:10:42 +0000 (02:10 +0300)
data/qcsrc/server/g_damage.qc
data/qcsrc/server/vore.qc

index 2d90a893359552a2675946cea7fce09004b08aa6..d86a49b84b16d1f79da3539c45c4f2e1fc0a59d4 100644 (file)
@@ -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
index 1a3fa9e40f4bd1fc1d47969e77ca3c291ace4702..9dfb21fe6afef659e4459abbdb129f03b348e8a8 100644 (file)
@@ -74,6 +74,7 @@ void Vore_CameraEffect_Apply()
                local float step;\r
                step = self.cvar_cl_vore_cameraspeed * frametime;\r
 \r
+               // not sure if these maths are good, as the effect should be smoother\r
                if(self.cameraeffect_current >= self.cameraeffect_target + step)\r
                        self.cameraeffect_current -= step;\r
                else if(self.cameraeffect_current <= self.cameraeffect_target - step)\r