From d68b79b7df96f24fedd8d8a38d70da17d1ca0b3b Mon Sep 17 00:00:00 2001 From: tzork Date: Tue, 11 Aug 2009 14:47:24 +0000 Subject: [PATCH] Wops, need more files for the HUD_SPIDEBOT fix. git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7424 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/client/View.qc | 4 +- data/qcsrc/server/vehicles/vehicles.qc | 60 -------------------------- 2 files changed, 2 insertions(+), 62 deletions(-) diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 050145137..53541d650 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -549,7 +549,7 @@ void CSQC_UpdateView(float w, float h) float hud; hud = getstati(STAT_HUD); - if(hud == HUD_SPIDEBOT) + if(hud == HUD_SPIDERBOT) { vector sz; CSQC_spider_HUD(); @@ -776,7 +776,7 @@ void CSQC_common_hud(void) Sbar_Draw(); break; - case HUD_SPIDEBOT: + case HUD_SPIDERBOT: CSQC_spider_HUD(); break; } diff --git a/data/qcsrc/server/vehicles/vehicles.qc b/data/qcsrc/server/vehicles/vehicles.qc index 6044b51c0..dba885125 100644 --- a/data/qcsrc/server/vehicles/vehicles.qc +++ b/data/qcsrc/server/vehicles/vehicles.qc @@ -1,69 +1,9 @@ void vehicle_stdproc_enter() { - self.owner = other; - - msg_entity = other; - WriteByte (MSG_ONE, SVC_SETVIEWPORT); - WriteEntity( MSG_ONE, self.vehicle_viewport); - - WriteByte (MSG_ONE, SVC_SETVIEWANGLES); - WriteAngle(MSG_ONE, self.vehicle_viewport.angles_x + self.angles_x); // tilt - WriteAngle(MSG_ONE, self.vehicle_viewport.angles_y + self.angles_y); // yaw - WriteAngle(MSG_ONE, self.vehicle_viewport.angles_z + self.angles_z); // flip - - //setattachment(other,self,""); - self.nextthink = 0; - self.owner.takedamage = DAMAGE_NO; - self.owner.solid = SOLID_NOT; - self.owner.alpha = -1; - //self.owner.PlayerPhysplug = spiderbot_pplug; - self.owner.vehicle = self; - self.owner.event_damage = SUB_Null; - self.owner.vehicle_health = (self.health / cvar("g_vehicle_spiderbot_health")); - self.owner.hud = HUD_SPIDEBOT; - self.colormap = self.owner.colormap; - self.tur_head.colormap = self.owner.colormap; - self.vehicle_hudmodel.viewmodelforclient = self.owner; - //self.tur_head.nodrawtoclient = self.owner; - - } void vehicle_stdproc_exit(float eject) { - self.velocity = '0 0 0'; - - msg_entity = self.owner; - WriteByte (MSG_ONE, SVC_SETVIEWPORT); - WriteEntity( MSG_ONE, self.owner); - - //setattachment(self.owner,world,""); - //self.think = spiderbot_think; - //self.nextthink = time; - - self.owner.takedamage = DAMAGE_AIM; - self.owner.solid = SOLID_SLIDEBOX; - self.owner.alpha = 1; - self.owner.PlayerPhysplug = SUB_Null; - self.owner.vehicle = world; - self.owner.view_ofs = PL_VIEW_OFS; - self.owner.hud = HUD_NORMAL; - self.owner.event_damage = PlayerDamage; - self.colormap = 1024; - self.tur_head.colormap = 1024; - self.vehicle_hudmodel.viewmodelforclient = self; - //self.tur_head.nodrawtoclient = self; - - if(eject) - { - makevectors(self.angles); - setorigin(self.owner,self.origin + v_forward * 100); - self.owner.velocity = (v_up + v_forward * 0.25) * 750; - } - else - setorigin(self.owner,self.origin - v_forward * 200); - - self.owner = world; } void vehicle_stdproc_regen() -- 2.39.2