clean up a bunch of unused local params

This commit is contained in:
Bill Currie 2002-02-19 00:19:27 +00:00
parent a9e3a8e018
commit 3be5c77603
16 changed files with 8 additions and 57 deletions

View file

@ -473,8 +473,6 @@ The monster is walking it's beat
*/ */
void(float dist) ai_walk = void(float dist) ai_walk =
{ {
local vector mtemp;
movedist = dist; movedist = dist;
if (self.classname == "monster_dragon") if (self.classname == "monster_dragon")
@ -676,10 +674,6 @@ The monster has an enemy it is trying to kill
*/ */
void(float dist) ai_run = void(float dist) ai_run =
{ {
local vector delta;
local float axis;
local float direct, ang_rint, ang_floor, ang_ceil;
movedist = dist; movedist = dist;
// see if the enemy is dead // see if the enemy is dead
if (self.enemy.health <= 0) if (self.enemy.health <= 0)

View file

@ -85,8 +85,6 @@ When a button is touched, it moves some distance in the direction of it's angle,
*/ */
void() func_button = void() func_button =
{ {
local float gtemp, ftemp;
if (self.sounds == 0) if (self.sounds == 0)
{ {
precache_sound ("buttons/airbut1.wav"); precache_sound ("buttons/airbut1.wav");

View file

@ -289,8 +289,6 @@ void() execute_changelevel =
void() changelevel_touch = void() changelevel_touch =
{ {
local entity pos;
if (other.classname != "player") if (other.classname != "player")
return; return;
@ -691,7 +689,6 @@ void() CheckRules =
void() PlayerDeathThink = void() PlayerDeathThink =
{ {
local entity old_self;
local float forward; local float forward;
if ((self.flags & FL_ONGROUND)) if ((self.flags & FL_ONGROUND))
@ -726,8 +723,6 @@ void() PlayerDeathThink =
void() PlayerJump = void() PlayerJump =
{ {
local vector start, end;
if (self.flags & FL_WATERJUMP) if (self.flags & FL_WATERJUMP)
return; return;
@ -898,9 +893,6 @@ Called every frame before physics are run
*/ */
void() PlayerPreThink = void() PlayerPreThink =
{ {
local float mspeed, aspeed;
local float r;
if (intermission_running) if (intermission_running)
{ {
IntermissionThink (); // otherwise a button could be missed between IntermissionThink (); // otherwise a button could be missed between
@ -1110,9 +1102,6 @@ Called every frame after physics are run
*/ */
void() PlayerPostThink = void() PlayerPostThink =
{ {
local float mspeed, aspeed;
local float r;
if (self.view_ofs == '0 0 0') if (self.view_ofs == '0 0 0')
return; // intermission or finale return; // intermission or finale
if (self.deadflag) if (self.deadflag)

View file

@ -277,8 +277,6 @@ float() CheckDemonJump =
float() DemonCheckAttack = float() DemonCheckAttack =
{ {
local vector vec;
// if close enough for slashing, go for it // if close enough for slashing, go for it
if (CheckDemonMelee ()) if (CheckDemonMelee ())
{ {

View file

@ -303,8 +303,6 @@ float() CheckDogJump =
float() DogCheckAttack = float() DogCheckAttack =
{ {
local vector vec;
// if close enough for slashing, go for it // if close enough for slashing, go for it
if (CheckDogMelee ()) if (CheckDogMelee ())
{ {

View file

@ -74,7 +74,7 @@ void() Laser_Touch =
void(vector org, vector vec) LaunchLaser = void(vector org, vector vec) LaunchLaser =
{ {
local vector vec; local vector vec;
if (self.classname == "monster_enforcer") if (self.classname == "monster_enforcer")
sound (self, CHAN_WEAPON, "enforcer/enfire.wav", 1, ATTN_NORM); sound (self, CHAN_WEAPON, "enforcer/enfire.wav", 1, ATTN_NORM);
@ -97,6 +97,7 @@ void(vector org, vector vec) LaunchLaser =
newmis.nextthink = time + 5; newmis.nextthink = time + 5;
newmis.think = SUB_Remove; newmis.think = SUB_Remove;
newmis.touch = Laser_Touch; newmis.touch = Laser_Touch;
traceoff();
}; };
@ -109,7 +110,7 @@ void() enforcer_fire =
makevectors (self.angles); makevectors (self.angles);
org = self.origin + v_forward * 30 + v_right * 8.5 + '0 0 16'; org = self.origin + v_forward * 30 + v_right * 8.5 + '0 0 16';
traceon();
LaunchLaser(org, self.enemy.origin - self.origin); LaunchLaser(org, self.enemy.origin - self.origin);
}; };

View file

@ -295,8 +295,6 @@ float() ShamCheckAttack =
{ {
local vector spot1, spot2; local vector spot1, spot2;
local entity targ; local entity targ;
local float chance;
local float enemy_yaw;
if (enemy_range == RANGE_MELEE) if (enemy_range == RANGE_MELEE)
{ {

View file

@ -149,7 +149,6 @@ void() item_health =
void() health_touch = void() health_touch =
{ {
local float amount;
local string s; local string s;
if (other.classname != "player") if (other.classname != "player")
@ -868,9 +867,6 @@ KEYS
void() key_touch = void() key_touch =
{ {
local entity stemp;
local float best;
if (other.classname != "player") if (other.classname != "player")
return; return;
if (other.health <= 0) if (other.health <= 0)
@ -1004,9 +1000,6 @@ END OF LEVEL RUNES
void() sigil_touch = void() sigil_touch =
{ {
local entity stemp;
local float best;
if (other.classname != "player") if (other.classname != "player")
return; return;
if (other.health <= 0) if (other.health <= 0)
@ -1077,9 +1070,6 @@ void() powerup_touch;
void() powerup_touch = void() powerup_touch =
{ {
local entity stemp;
local float best;
if (other.classname != "player") if (other.classname != "player")
return; return;
if (other.health <= 0) if (other.health <= 0)

View file

@ -444,7 +444,6 @@ void() bubble_remove =
void() bubble_bob = void() bubble_bob =
{ {
local float rnd1, rnd2, rnd3; local float rnd1, rnd2, rnd3;
local vector vtmp1, modi;
self.cnt = self.cnt + 1; self.cnt = self.cnt + 1;
if (self.cnt == 4) if (self.cnt == 4)

View file

@ -48,8 +48,6 @@ enemy as activator.
*/ */
void() monster_death_use = void() monster_death_use =
{ {
local entity ent, otemp, stemp;
// fall to ground // fall to ground
if (self.flags & FL_FLY) if (self.flags & FL_FLY)
self.flags = self.flags - FL_FLY; self.flags = self.flags - FL_FLY;
@ -68,8 +66,6 @@ void() monster_death_use =
void() walkmonster_start_go = void() walkmonster_start_go =
{ {
local string stemp;
local entity etemp;
self.origin_z = self.origin_z + 1; // raise off floor a bit self.origin_z = self.origin_z + 1; // raise off floor a bit
droptofloor(); droptofloor();

View file

@ -89,7 +89,7 @@ OgreFireGrenade
*/ */
void() OgreFireGrenade = void() OgreFireGrenade =
{ {
local entity missile, mpuff; local entity missile;
self.effects = self.effects | EF_MUZZLEFLASH; self.effects = self.effects | EF_MUZZLEFLASH;

View file

@ -147,8 +147,6 @@ Set "sounds" to one of the following:
void() func_plat = void() func_plat =
{ {
local entity t;
if (!self.t_length) if (!self.t_length)
self.t_length = 80; self.t_length = 80;
if (!self.t_width) if (!self.t_width)

View file

@ -221,8 +221,6 @@ void() trigger_secret =
void() counter_use = void() counter_use =
{ {
local string junk;
self.count = self.count - 1; self.count = self.count - 1;
if (self.count < 0) if (self.count < 0)
return; return;

View file

@ -88,7 +88,7 @@ SpawnMeatSpray
*/ */
void(vector org, vector vel) SpawnMeatSpray = void(vector org, vector vel) SpawnMeatSpray =
{ {
local entity missile, mpuff; local entity missile;
local vector org; local vector org;
missile = spawn (); missile = spawn ();
@ -373,7 +373,7 @@ W_FireRocket
*/ */
void() W_FireRocket = void() W_FireRocket =
{ {
local entity missile, mpuff; local entity missile;
self.currentammo = self.ammo_rockets = self.ammo_rockets - 1; self.currentammo = self.ammo_rockets = self.ammo_rockets - 1;
@ -548,7 +548,7 @@ W_FireGrenade
*/ */
void() W_FireGrenade = void() W_FireGrenade =
{ {
local entity missile, mpuff; local entity missile;
self.currentammo = self.ammo_rockets = self.ammo_rockets - 1; self.currentammo = self.ammo_rockets = self.ammo_rockets - 1;
@ -627,7 +627,6 @@ void(vector org, vector dir) launch_spike =
void() W_FireSuperSpikes = void() W_FireSuperSpikes =
{ {
local vector dir; local vector dir;
local entity old;
sound (self, CHAN_WEAPON, "weapons/spike2.wav", 1, ATTN_NORM); sound (self, CHAN_WEAPON, "weapons/spike2.wav", 1, ATTN_NORM);
self.attack_finished = time + 0.2; self.attack_finished = time + 0.2;
@ -643,7 +642,6 @@ void() W_FireSuperSpikes =
void(float ox) W_FireSpikes = void(float ox) W_FireSpikes =
{ {
local vector dir; local vector dir;
local entity old;
makevectors (self.v_angle); makevectors (self.v_angle);
@ -674,7 +672,6 @@ void(float ox) W_FireSpikes =
.float hit_z; .float hit_z;
void() spike_touch = void() spike_touch =
{ {
local float rand;
if (other == self.owner) if (other == self.owner)
return; return;
@ -714,7 +711,6 @@ local float rand;
void() superspike_touch = void() superspike_touch =
{ {
local float rand;
if (other == self.owner) if (other == self.owner)
return; return;

View file

@ -359,8 +359,6 @@ void() bodyque =
void() InitBodyQue = void() InitBodyQue =
{ {
local entity e;
bodyque_head = spawn(); bodyque_head = spawn();
bodyque_head.classname = "bodyque"; bodyque_head.classname = "bodyque";
bodyque_head.owner = spawn(); bodyque_head.owner = spawn();

View file

@ -161,7 +161,7 @@ ZombieFireGrenade
*/ */
void(vector st) ZombieFireGrenade = void(vector st) ZombieFireGrenade =
{ {
local entity missile, mpuff; local entity missile;
local vector org; local vector org;
sound (self, CHAN_WEAPON, "zombie/z_shot1.wav", 1, ATTN_NORM); sound (self, CHAN_WEAPON, "zombie/z_shot1.wav", 1, ATTN_NORM);