summaryrefslogtreecommitdiff
path: root/src/game/g_weapon.c
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2001-09-15 03:42:41 +0000
committerTim Angus <tim@ngus.net>2001-09-15 03:42:41 +0000
commitcab6cb5c4a989b11e6f45b74f87d84a961235984 (patch)
treefa10bd39de3cfbad896ad63a260b3d07c164bdb3 /src/game/g_weapon.c
parent5e95698bb34a46c68bae1f5f1c089bf794e5a43d (diff)
Trapper buildable. Other fixes/tweaks
Diffstat (limited to 'src/game/g_weapon.c')
-rw-r--r--src/game/g_weapon.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index 3e2e2caa..85a9b59d 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -346,11 +346,11 @@ SAWBLADE
======================================================================
*/
-void Weapon_SawbladeLauncher_Fire( gentity_t *ent )
+void Weapon_LockBlobLauncher_Fire( gentity_t *ent )
{
gentity_t *m;
- m = fire_sawblade( ent, muzzle, forward );
+ m = fire_lockblob( ent, muzzle, forward );
// VectorAdd( m->s.pos.trDelta, ent->client->ps.velocity, m->s.pos.trDelta ); // "real" physics
}
@@ -774,6 +774,7 @@ void Weapon_Grab_Fire( gentity_t *ent )
//lock client
traceEnt->client->ps.stats[ STAT_STATE ] |= SS_GRABBED;
traceEnt->client->lastGrabTime = level.time;
+ VectorCopy( traceEnt->client->ps.viewangles, traceEnt->client->ps.grapplePoint );
}
}
@@ -1024,7 +1025,7 @@ void FireWeapon2( gentity_t *ent )
case WP_RAILGUN:
weapon_railgun_fire( ent );
break;
- case WP_SAWBLADE_LAUNCHER:
+ case WP_LOCKBLOB_LAUNCHER:
break;
case WP_BFG:
BFG_Fire( ent );
@@ -1111,8 +1112,8 @@ void FireWeapon( gentity_t *ent )
case WP_RAILGUN:
weapon_railgun_fire( ent );
break;
- case WP_SAWBLADE_LAUNCHER:
- Weapon_SawbladeLauncher_Fire( ent );
+ case WP_LOCKBLOB_LAUNCHER:
+ Weapon_LockBlobLauncher_Fire( ent );
break;
case WP_BFG:
BFG_Fire( ent );