team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

*** empty log message *** 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1823 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Magnus 2006-01-08 21:40:47 +00:00
parent b52ebcd9d3
commit 4fb1c62dd5
6 changed files with 20 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
quakec/fallout2/defs.qc
View File

@ -664,7 +664,6 @@ float red_armor;
.float vote6; .float vote6;
.float vote7; .float vote7;
.float vote8; .float vote8;
.float vote9;
.float spamdelay; .float spamdelay;
.string armornoise; .string armornoise;

2
quakec/fallout2/knight.qc
View File

@ -29,7 +29,7 @@ $frame painb10 painb11
//frame attack1 attack2 attack3 attack4 attack5 attack6 attack7 //frame attack1 attack2 attack3 attack4 attack5 attack6 attack7
//frame attack8 attack9 attack10 attack11 //frame attack8 attack9 attack10 attack11
$frame attackb1 attackb1 attackb2 attackb3 attackb4 attackb5 $frame attackb1 attackb2 attackb3 attackb4 attackb5
$frame attackb6 attackb7 attackb8 attackb9 attackb10 $frame attackb6 attackb7 attackb8 attackb9 attackb10
$frame walk1 walk2 walk3 walk4 walk5 walk6 walk7 walk8 walk9 $frame walk1 walk2 walk3 walk4 walk5 walk6 walk7 walk8 walk9

9
quakec/fallout2/misc.qc
View File

@ -313,8 +313,6 @@ void () hostage_pain =
void () hostage_think = void () hostage_think =
{ {
local entity te;
self.nextthink = (time + MULTICAST_PVS_R); self.nextthink = (time + MULTICAST_PVS_R);
self.think = hostage_think; self.think = hostage_think;
if ((self.health <= MULTICAST_ALL)) if ((self.health <= MULTICAST_ALL))
@ -333,8 +331,6 @@ void () hostage_think =
void () sci_think = void () sci_think =
{ {
local entity te;
self.think = sci_think; self.think = sci_think;
self.nextthink = (time + 15); self.nextthink = (time + 15);
@ -344,8 +340,8 @@ void () sci_think =
void () hostage_spawn = void () hostage_spawn =
{ {
local float qq;
local entity te; local entity te;
local float qq;
precache_model ("progs/hosfem.mdl"); precache_model ("progs/hosfem.mdl");
precache_model ("progs/hosguy.mdl"); precache_model ("progs/hosguy.mdl");
@ -400,9 +396,6 @@ void () hostage_spawn =
void () scientist = void () scientist =
{ {
local float qq;
local entity te;
precache_model ("progs/hosguy.mdl"); precache_model ("progs/hosguy.mdl");
precache_sound ("misc/hosdie1.wav"); precache_sound ("misc/hosdie1.wav");
precache_sound ("misc/hosdie2.wav"); precache_sound ("misc/hosdie2.wav");

11
quakec/fallout2/mod_buy.qc
View File

@ -1,14 +1,14 @@
void(entity to, float iid, float count) AddNonStackable = void(entity to, float iid, float amount) AddNonStackable =
{ {
local float slot; local float slot;
slot = FindSuitableEmptySlot(to, iid); slot = FindSuitableEmptySlot(to, iid);
if (slot) if (slot)
SetItemSlot(to, slot, SlotVal(iid, count)); SetItemSlot(to, slot, SlotVal(iid, amount));
}; };
void(entity to, float iid, float count) AddStackable = void(entity to, float iid, float amount) AddStackable =
{ {
local float slot; local float slot;
@ -16,13 +16,12 @@ void(entity to, float iid, float count) AddStackable =
if (!slot) if (!slot)
slot = FindSuitableEmptySlot(to, iid); slot = FindSuitableEmptySlot(to, iid);
if (slot) if (slot)
SetItemSlot(to, slot, SlotVal(iid, count + ToStatus(ItemInSlot(to, slot)))); SetItemSlot(to, slot, SlotVal(iid, amount + ToStatus(ItemInSlot(to, slot))));
} }
void(float cost, float iid) BuyStackable = void(float cost, float iid) BuyStackable =
{ {
local string z; local string z;
local float x, y;
if (self.ammo_shells < cost) if (self.ammo_shells < cost)
{ {
@ -275,7 +274,7 @@ void (float wt, float cost, float item) BuyArmor =
void (float wt, float cost, float item) BuyArmor = void (float wt, float cost, float item) BuyArmor =
{ {
local string z; local string z;
local float x, y; local float x;
if (self.ammo_shells < cost) if (self.ammo_shells < cost)
{ {

8
quakec/fallout2/weapons.qc
View File

@ -1506,7 +1506,7 @@ void() SuperDamageSound =
void () DropAmmo = void () DropAmmo =
{ {
local .float wslot; local .float wslot;
local float ammo;
wslot = SlotField(self.current_slot); wslot = SlotField(self.current_slot);
self.currentammo = (ToStatus(self.wslot) )- 1; self.currentammo = (ToStatus(self.wslot) )- 1;
@ -1710,7 +1710,6 @@ void () EMPExplode =
void (vector org) CreateSmoke = void (vector org) CreateSmoke =
{ {
newmis = spawn (); newmis = spawn ();
setmodel (newmis, "progs/smoke.mdl");
setorigin (newmis, org); setorigin (newmis, org);
newmis.movetype = MOVETYPE_NONE; newmis.movetype = MOVETYPE_NONE;
newmis.solid = SOLID_NOT; newmis.solid = SOLID_NOT;
@ -2204,9 +2203,8 @@ void (float dam, float rec, string snd, float rng, float rate) FireSMG =
void (float dam, float rec, string snd, float rng, float rate) FireAssaultRifle = void (float dam, float rec, string snd, float rng, float rate) FireAssaultRifle =
{ {
local float hs, tmp, zdif, xdif, ydif, is_headshot, z; local float hs, tmp, zdif, is_headshot, z;
local string xd, yd, zd; local vector dir, source, targ, org, adjust, headshot_check;
local vector dir, source, targ, org, org2, adjust, headshot_check;
sound (self, CHAN_WEAPON, snd, 1, ATTN_NORM); sound (self, CHAN_WEAPON, snd, 1, ATTN_NORM);

34
quakec/fallout2/world.qc
View File

@ -191,8 +191,6 @@ void() main =
void () ResetHostages = void () ResetHostages =
{ {
local entity te; local entity te;
local entity ze;
local entity ge;
te = find (world, classname, "hostage"); te = find (world, classname, "hostage");
@ -250,7 +248,6 @@ void () ResetHostages =
void () ResetGhouls = void () ResetGhouls =
{ {
local entity te;
local entity ze; local entity ze;
ze = find (world, classname, "ighoul"); ze = find (world, classname, "ighoul");
@ -270,7 +267,6 @@ void () ResetGhouls =
void (float won) ReplacePlayers = void (float won) ReplacePlayers =
{ {
local entity te; local entity te;
local entity spot;
local float qq; local float qq;
round_end = 1.9; round_end = 1.9;
@ -563,7 +559,7 @@ void () CheckZombie1 =
void () CheckZombie2 = void () CheckZombie2 =
{ {
local entity te; local entity te;
local float team1, team2; local float team1;
CountGhouls (); CountGhouls ();
if ((msgcount == 0)) if ((msgcount == 0))
@ -686,29 +682,12 @@ void () CheckDefuse =
void () GameControl = void () GameControl =
{ {
local float r;
local float qq;
local float qqq;
local entity de;
local entity te; local entity te;
local float team1; local float team1;
local float team2; local float team2;
local float team_won;
local float gcnt;
local float red; local float red;
local float blue; local float blue;
local float botx, x, y; local float x, y;
local entity iinfo;
local entity z;
local entity boss2;
local entity ke;
local entity spot;
local float boss;
local string vv;
local string hos1;
local string hos2;
local string zz;
local string ghoulsleft;
local float randy; local float randy;
local float end; local float end;
@ -1018,7 +997,6 @@ void () GameControl =
void () VoteBoy = void () VoteBoy =
{ {
local entity te; local entity te;
local float q;
self.nextthink = (time + DRAW2); self.nextthink = (time + DRAW2);
self.think = VoteBoy; self.think = VoteBoy;
@ -1483,9 +1461,17 @@ void() worldspawn =
precache_model ("progs/v_piperifle.mdl"); precache_model ("progs/v_piperifle.mdl");
precache_model ("progs/v_handgren.mdl"); precache_model ("progs/v_handgren.mdl");
precache_model ("progs/handgren.mdl");
precache_model ("progs/plasma.mdl");
precache_model ("progs/ray.mdl");
precache_model ("progs/sneak.mdl"); precache_model ("progs/sneak.mdl");
precache_model ("progs/dead.mdl"); precache_model ("progs/dead.mdl");
precache_model ("progs/hbar.spr"); precache_model ("progs/hbar.spr");
precache_model ("progs/blast.mdl");
precache_model ("progs/station.mdl");
precache_model ("progs/camera.mdl");
precache_model ("progs/tehghoul.mdl");
precache_model ("progs/ray.mdl");
precache_model ("progs/w_knife.mdl"); precache_model ("progs/w_knife.mdl");
precache_model ("progs/w_pipe.mdl"); precache_model ("progs/w_pipe.mdl");