From 4fb1c62dd5b6c985e24d23bef36e33ad205c3be4 Mon Sep 17 00:00:00 2001 From: Magnus Date: Sun, 8 Jan 2006 21:40:47 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1823 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- quakec/fallout2/defs.qc | 1 - quakec/fallout2/knight.qc | 2 +- quakec/fallout2/misc.qc | 9 +-------- quakec/fallout2/mod_buy.qc | 11 +++++------ quakec/fallout2/weapons.qc | 8 +++----- quakec/fallout2/world.qc | 34 ++++++++++------------------------ 6 files changed, 20 insertions(+), 45 deletions(-) diff --git a/quakec/fallout2/defs.qc b/quakec/fallout2/defs.qc index aff51f80b..980260ec6 100644 --- a/quakec/fallout2/defs.qc +++ b/quakec/fallout2/defs.qc @@ -664,7 +664,6 @@ float red_armor; .float vote6; .float vote7; .float vote8; -.float vote9; .float spamdelay; .string armornoise; diff --git a/quakec/fallout2/knight.qc b/quakec/fallout2/knight.qc index a3a2cfdf6..8baa4a0a7 100644 --- a/quakec/fallout2/knight.qc +++ b/quakec/fallout2/knight.qc @@ -29,7 +29,7 @@ $frame painb10 painb11 //frame attack1 attack2 attack3 attack4 attack5 attack6 attack7 //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 walk1 walk2 walk3 walk4 walk5 walk6 walk7 walk8 walk9 diff --git a/quakec/fallout2/misc.qc b/quakec/fallout2/misc.qc index 2021b6913..ab5ed4477 100644 --- a/quakec/fallout2/misc.qc +++ b/quakec/fallout2/misc.qc @@ -313,8 +313,6 @@ void () hostage_pain = void () hostage_think = { - local entity te; - self.nextthink = (time + MULTICAST_PVS_R); self.think = hostage_think; if ((self.health <= MULTICAST_ALL)) @@ -333,8 +331,6 @@ void () hostage_think = void () sci_think = { - local entity te; - self.think = sci_think; self.nextthink = (time + 15); @@ -344,8 +340,8 @@ void () sci_think = void () hostage_spawn = { - local float qq; local entity te; + local float qq; precache_model ("progs/hosfem.mdl"); precache_model ("progs/hosguy.mdl"); @@ -400,9 +396,6 @@ void () hostage_spawn = void () scientist = { - local float qq; - local entity te; - precache_model ("progs/hosguy.mdl"); precache_sound ("misc/hosdie1.wav"); precache_sound ("misc/hosdie2.wav"); diff --git a/quakec/fallout2/mod_buy.qc b/quakec/fallout2/mod_buy.qc index 8fa0d17a9..16095006f 100644 --- a/quakec/fallout2/mod_buy.qc +++ b/quakec/fallout2/mod_buy.qc @@ -1,14 +1,14 @@ -void(entity to, float iid, float count) AddNonStackable = +void(entity to, float iid, float amount) AddNonStackable = { local float slot; slot = FindSuitableEmptySlot(to, iid); 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; @@ -16,13 +16,12 @@ void(entity to, float iid, float count) AddStackable = if (!slot) slot = FindSuitableEmptySlot(to, iid); 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 = { local string z; - local float x, y; 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 = { local string z; - local float x, y; + local float x; if (self.ammo_shells < cost) { diff --git a/quakec/fallout2/weapons.qc b/quakec/fallout2/weapons.qc index e9f25d405..5e1956e96 100644 --- a/quakec/fallout2/weapons.qc +++ b/quakec/fallout2/weapons.qc @@ -1506,7 +1506,7 @@ void() SuperDamageSound = void () DropAmmo = { local .float wslot; - local float ammo; + wslot = SlotField(self.current_slot); self.currentammo = (ToStatus(self.wslot) )- 1; @@ -1710,7 +1710,6 @@ void () EMPExplode = void (vector org) CreateSmoke = { newmis = spawn (); - setmodel (newmis, "progs/smoke.mdl"); setorigin (newmis, org); newmis.movetype = MOVETYPE_NONE; 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 = { - local float hs, tmp, zdif, xdif, ydif, is_headshot, z; - local string xd, yd, zd; - local vector dir, source, targ, org, org2, adjust, headshot_check; + local float hs, tmp, zdif, is_headshot, z; + local vector dir, source, targ, org, adjust, headshot_check; sound (self, CHAN_WEAPON, snd, 1, ATTN_NORM); diff --git a/quakec/fallout2/world.qc b/quakec/fallout2/world.qc index 5e71ede98..a95bb0314 100644 --- a/quakec/fallout2/world.qc +++ b/quakec/fallout2/world.qc @@ -191,8 +191,6 @@ void() main = void () ResetHostages = { local entity te; - local entity ze; - local entity ge; te = find (world, classname, "hostage"); @@ -250,7 +248,6 @@ void () ResetHostages = void () ResetGhouls = { - local entity te; local entity ze; ze = find (world, classname, "ighoul"); @@ -270,7 +267,6 @@ void () ResetGhouls = void (float won) ReplacePlayers = { local entity te; - local entity spot; local float qq; round_end = 1.9; @@ -563,7 +559,7 @@ void () CheckZombie1 = void () CheckZombie2 = { local entity te; - local float team1, team2; + local float team1; CountGhouls (); if ((msgcount == 0)) @@ -686,29 +682,12 @@ void () CheckDefuse = void () GameControl = { - local float r; - local float qq; - local float qqq; - local entity de; local entity te; local float team1; local float team2; - local float team_won; - local float gcnt; local float red; local float blue; - local float botx, 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 x, y; local float randy; local float end; @@ -1018,7 +997,6 @@ void () GameControl = void () VoteBoy = { local entity te; - local float q; self.nextthink = (time + DRAW2); self.think = VoteBoy; @@ -1483,9 +1461,17 @@ void() worldspawn = precache_model ("progs/v_piperifle.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/dead.mdl"); 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_pipe.mdl");