eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

*** empty log message ***

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1798 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Magnus 2006-01-06 02:12:00 +00:00
parent b6b20b55ed
commit a613214e54
4 changed files with 35 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
quakec/fallout2/client.qc
View file

@ -1203,6 +1203,35 @@ void() PlayerPreThink =
makevectors (self.v_angle); // is this still used makevectors (self.v_angle); // is this still used
if (self.cycle1 < time)
{
if (self.currentmenu != "none")
DisplayMenu();
//if (class == 0 || self.team == 0)
// return;
Identify();
PositionControl();
SpeedControl();
WeightControl();
ArmorCheck();
Crosshair();
if (self.health > self.max_health)
self.health = self.max_health;
if (self.ragetime > time)
stuffcmd(self, "v_cshift 75 0 0 75\n");
else if (self.sneak > 0)
stuffcmd(self, "v_cshift 0 75 0 75\n");
else
stuffcmd(self, "v_cshift 0 0 0 0\n");
self.cycle1 = time + 0.5;
}
if (self.materialize > 0) if (self.materialize > 0)
{ {
self.materialize = self.materialize - 1; self.materialize = self.materialize - 1;
@ -1248,30 +1277,6 @@ void() PlayerPreThink =
self.deathtype = ""; self.deathtype = "";
if (self.cycle1 < time)
{
Identify();
PositionControl();
SpeedControl();
WeightControl();
ArmorCheck();
Crosshair();
if (self.currentmenu != "none")
DisplayMenu();
if (self.health > self.max_health)
self.health = self.max_health;
if (self.ragetime > time)
stuffcmd(self, "v_cshift 75 0 0 75\n");
else if (self.sneak > 0)
stuffcmd(self, "v_cshift 0 75 0 75\n");
else
stuffcmd(self, "v_cshift 0 0 0 0\n");
self.cycle1 = time + 0.5;
}
if (self.cycle2 < time) if (self.cycle2 < time)
{ {

6
quakec/fallout2/combat.qc
View file

@ -300,13 +300,15 @@ void(entity targ, entity inflictor, entity attacker, float damage) T_Damage =
break; break;
} }
if (damage <= 0)
if (take <= 0)
{ {
damage = 0; take = 0;
sound (targ, CHAN_BODY, targ.armornoise, 1, ATTN_NORM); sound (targ, CHAN_BODY, targ.armornoise, 1, ATTN_NORM);
return; return;
} }
targ.health = targ.health - take; targ.health = targ.health - take;
if (targ.health <= 0) if (targ.health <= 0)

2
quakec/fallout2/fight.qc
View file

@ -188,7 +188,7 @@ void() ai_melee =
if (vlen(delta) > 60) if (vlen(delta) > 60)
return; return;
ldmg = (random() + random() + random()) * 3; ldmg = 6+random()*6;
T_Damage (self.enemy, self, self, ldmg); T_Damage (self.enemy, self, self, ldmg);
}; };

2
quakec/fallout2/weapons.qc
View file

@ -1094,7 +1094,7 @@ void() W_Attack =
else if (weap == IID_WP_DKS1) else if (weap == IID_WP_DKS1)
FireAssaultRifle(30, 2, "weapons/dks-1.wav", 8000, 0.5); FireAssaultRifle(30, 2, "weapons/dks-1.wav", 8000, 0.5);
else if (weap == IID_WP_MOONLIGHT) else if (weap == IID_WP_MOONLIGHT)
FireAssaultRifle(16, 2, "weapons/m4a1.wav", 4000, 0.1); FireAssaultRifle(16, 2, "weapons/m4-nw.wav", 4000, 0.1);
//float IID_WP_SA80 = 420; //float IID_WP_SA80 = 420;
//float IID_WP_GAUSERIFLE = 421; //float IID_WP_GAUSERIFLE = 421;