summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author/dev/humancontroller <devhc@example.com>2017-04-13 11:30:00 +0000
committer/dev/humancontroller <devhc@example.com>2017-04-15 17:24:20 +0200
commita2acd48085c60e956b1cad6a9fa12578acbeec5f (patch)
treec70644eec35e916a25634cfcd74bc18508ee16f0
parent6928f08f262b38d32c6e4380969f919b5de1bbc3 (diff)
allow replenishing of poison without stupid per-player cooldown delays
-rw-r--r--src/game/g_buildable.c11
-rw-r--r--src/game/tremulous.h1
2 files changed, 2 insertions, 10 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index ed243cc..f6a98f6 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -1604,15 +1604,8 @@ void ABooster_Touch( gentity_t *self, gentity_t *other, trace_t *trace )
return;
}
- //only allow boostage once every 30 seconds
- if( client->lastBoostedTime + BOOSTER_INTERVAL > level.time )
- return;
-
- if( !( client->ps.stats[ STAT_STATE ] & SS_BOOSTED ) )
- {
- client->ps.stats[ STAT_STATE ] |= SS_BOOSTED;
- client->lastBoostedTime = level.time;
- }
+ client->ps.stats[ STAT_STATE ] |= SS_BOOSTED;
+ client->lastBoostedTime = level.time;
}
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index c007489..239bb46 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -246,7 +246,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BOOSTER_SPLASHDAMAGE 50
#define BOOSTER_SPLASHRADIUS 50
#define BOOSTER_CREEPSIZE 120
-#define BOOSTER_INTERVAL 30000 //time in msec between uses (per player)
#define BOOSTER_REGEN_MOD 2.0f
#define BOOST_TIME 30000