From 3a356bd0b6cd787b30dc0ef2111f3e897b9e8801 Mon Sep 17 00:00:00 2001 From: Jakob MG Date: Tue, 22 Nov 2011 10:29:22 +0100 Subject: [PATCH] Fix incorrect sending of health/shiled on vehicle enter --- qcsrc/server/vehicles/racer.qc | 4 ++-- qcsrc/server/vehicles/raptor.qc | 4 ++-- qcsrc/server/vehicles/spiderbot.qc | 4 ++-- qcsrc/server/vehicles/vehicles.qc | 4 +--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc index 998736b5f..fa188bbb1 100644 --- a/qcsrc/server/vehicles/racer.qc +++ b/qcsrc/server/vehicles/racer.qc @@ -495,8 +495,8 @@ void racer_think() void racer_enter() { self.movetype = MOVETYPE_BOUNCE; - self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_racer_health); - self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_racer_shield); + self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_racer_health) * 100; + self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_racer_shield) * 100; if(self.owner.flagcarried) setorigin(self.owner.flagcarried, '-190 0 96'); diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc index f5ecd97e3..9e80f1869 100644 --- a/qcsrc/server/vehicles/raptor.qc +++ b/qcsrc/server/vehicles/raptor.qc @@ -184,8 +184,8 @@ void raptor_enter() self.owner.PlayerPhysplug = raptor_takeoff; self.movetype = MOVETYPE_BOUNCEMISSILE; self.solid = SOLID_SLIDEBOX; - self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_raptor_health); - self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_raptor_shield); + self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_raptor_health) * 100; + self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_raptor_shield) * 100; self.velocity_z = 1; // Nudge upwards to takeoff sequense can work. self.tur_head.exteriormodeltoclient = self.owner; diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc index 79d413e1d..eb88fb741 100644 --- a/qcsrc/server/vehicles/spiderbot.qc +++ b/qcsrc/server/vehicles/spiderbot.qc @@ -433,8 +433,8 @@ void spiderbot_enter() { self.movetype = MOVETYPE_WALK; - self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_spiderbot_health); - self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_spiderbot_shield); + self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_spiderbot_health) * 100; + self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_spiderbot_shield) * 100; if(self.owner.flagcarried) { diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc index 47c0803e1..0aae5e174 100644 --- a/qcsrc/server/vehicles/vehicles.qc +++ b/qcsrc/server/vehicles/vehicles.qc @@ -690,9 +690,7 @@ void shieldhit_think() } void vehicles_painframe() -{ -//.float pain_finished; //Added by Supajoe - +{ if(self.owner.vehicle_health <= 50) if(self.pain_frame < time) { -- 2.39.2