mirror of
https://github.com/nzp-team/quakec.git
synced 2025-03-20 01:41:59 +00:00
SERVER: Add support for Hospital from NZ:P Beta
This commit is contained in:
parent
407006191c
commit
028e0a5a99
4 changed files with 16 additions and 8 deletions
|
@ -93,7 +93,7 @@ void() SUB_UseTargets =
|
|||
//
|
||||
// kill the killtagets
|
||||
//
|
||||
if (self.killtarget)
|
||||
if (self.killtarget && self.killtarget != self.target)
|
||||
{
|
||||
t = world;
|
||||
do
|
||||
|
|
|
@ -648,6 +648,7 @@ string(string asset) convert_old_asset_path =
|
|||
case "progs/sandbags.mdl":
|
||||
ret = "models/props/sandbags.mdl";
|
||||
break;
|
||||
case "progs/dentist_chair.mdl":
|
||||
case "progs/props/dentist_chair.mdl":
|
||||
ret = "models/props/dentist_chair.mdl";
|
||||
break;
|
||||
|
@ -708,6 +709,13 @@ string(string asset) convert_old_asset_path =
|
|||
case "progs/props/trash_con.mdl":
|
||||
ret = "models/props/trash_con.mdl";
|
||||
break;
|
||||
case "progs/flame2.mdl":
|
||||
ret = "models/props/flame.mdl";
|
||||
break;
|
||||
case "progs/toilet.mdl":
|
||||
ret = "models/props/toilet.mdl";
|
||||
break;
|
||||
case "progs/fridge.mdl":
|
||||
case "progs/props/fridge.mdl":
|
||||
ret = "models/props/fridge.mdl";
|
||||
break;
|
||||
|
|
|
@ -280,8 +280,8 @@ void() Compat_ConvertBetaBarricade =
|
|||
self.origin -= v_forward*2;
|
||||
setsize(self, '-30 -30 -10','30 30 10');
|
||||
self.box1 = self.origin + (v_forward * -50) + (v_up * -50);
|
||||
self.box2 = self.box1 + (v_right * 50);
|
||||
self.box3 = self.box1 + (v_right * -50);
|
||||
self.box2 = self.box1 + (v_right * 25);
|
||||
self.box3 = self.box1 + (v_right * -25);
|
||||
self.idlebox = self.box1 + (v_forward * -50);
|
||||
self.hop_spot = self.origin + v_forward * 50;
|
||||
self.hop_spot_x -= 5;
|
||||
|
|
|
@ -824,15 +824,15 @@ void(float damage, vector dir, vector org, vector plane, entity hit_ent, float s
|
|||
|
||||
self = oldself;
|
||||
return;
|
||||
} else if (hit_ent.classname == "door" || hit_ent.classname == "door_nzp") {
|
||||
local entity old;
|
||||
old = self;
|
||||
} else if (hit_ent.solid == SOLID_BSP) {
|
||||
oldself = self;
|
||||
self = hit_ent;
|
||||
self.health -= damage;
|
||||
self.enemy = oldself;
|
||||
|
||||
if (self.health < 0)
|
||||
door_use();
|
||||
self = old;
|
||||
self.th_die();
|
||||
self = oldself;
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue