diff options
| author | enneract <trem.redman@gmail.com> | 2014-11-19 11:31:42 +0100 |
|---|---|---|
| committer | enneract <trem.redman@gmail.com> | 2014-11-19 11:31:42 +0100 |
| commit | 2a93a38bfa8feab7e7f9be7332f75f2d2b0036e7 (patch) | |
| tree | 057596e5a50e416cb2e20db81ffd1b070de7a0b5 /src/game/g_missile.c | |
| parent | fd19ccb037e349286e3b72a1277c58079056fcc2 (diff) | |
Merge WP_ABUILD and WP_ABUILD2 to free a weapon slot.
Diffstat (limited to 'src/game/g_missile.c')
| -rw-r--r-- | src/game/g_missile.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game/g_missile.c b/src/game/g_missile.c index 74b351c..74ee72b 100644 --- a/src/game/g_missile.c +++ b/src/game/g_missile.c @@ -207,8 +207,7 @@ void G_MissileImpact( gentity_t *ent, trace_t *trace ) if( other->client ) { if( ( other->client->ps.stats[ STAT_STATE ] & SS_SLOWLOCKED ) - && ( other->s.weapon < WP_ALEVEL3 - || ( other->s.weapon == WP_ABUILD2 || other->s.weapon == WP_ABUILD ) ) ) + && ( other->s.weapon < WP_ALEVEL3 || other->s.weapon == WP_ABUILD ) ) { other->client->ps.stats[ STAT_STATE ] |= SS_BLOBLOCKED; other->client->lastLockTime = level.time; @@ -1502,7 +1501,7 @@ gentity_t *fire_slowBlob( gentity_t *self, vec3_t start, vec3_t dir ) bolt->think = G_ExplodeMissile; bolt->s.eType = ET_MISSILE; bolt->r.svFlags = SVF_USE_CURRENT_ORIGIN; - bolt->s.weapon = WP_ABUILD2; + bolt->s.weapon = WP_ABUILD; bolt->s.generic1 = self->s.generic1; //weaponMode bolt->r.ownerNum = self->s.number; bolt->parent = self; |